eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 60 Projects 1 Releases Packages Wiki Activity Actions

Update src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
All checks were successful
eden-license / license-header (pull_request) Successful in 21s
Details

Browse source
This commit is contained in:
SDK-Chan 2025-08-25 17:16:17 +02:00
parent b668b94710
commit 610383262d
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
View file

@ -216,15 +216,11 @@ NvResult nvhost_gpu::SetErrorNotifier(IoctlSetErrorNotifier& params) {
} }
void nvhost_gpu::PostErrorNotification(u32 info32, u16 info16, NotifierStatus status) { void nvhost_gpu::PostErrorNotification(u32 info32, u16 info16, NotifierStatus status) {
// Needed to avoid lock ordering issues with error_notifier_event->Signal() if (error_notifier_params.mem == 0 || error_notifier_params.size < sizeof(IoctlGetErrorNotification)) {
{ return;
std::scoped_lock lk(channel_mutex);
if (error_notifier_params.mem == 0 || error_notifier_params.size < sizeof(IoctlGetErrorNotification)) {
return;
}
} }
auto handle = nvmap.GetHandle(static_cast<NvCore::NvMap::Handle::Id>(error_notifier_params.mem)); auto handle = nvmap.GetHandle(static_cast<NvCore::NvMap::Handle::Id>(error_notifier_params.mem));
if (!handle || !handle->address) return; if (!handle || !handle->address) return;
@ -367,7 +363,7 @@ NvResult nvhost_gpu::SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, Tegra::CommandL
auto& gpu = system.GPU(); auto& gpu = system.GPU();
std::unique_lock<std::mutex> lk(channel_mutex); std::scoped_lock lock(channel_mutex);
const auto bind_id = channel_state->bind_id; const auto bind_id = channel_state->bind_id;
@ -375,7 +371,6 @@ NvResult nvhost_gpu::SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, Tegra::CommandL
if (flags.fence_wait.Value()) { if (flags.fence_wait.Value()) {
if (flags.increment_value.Value()) { if (flags.increment_value.Value()) {
lk.unlock();
PostErrorNotification(flags.raw, 0, NotifierStatus::GenericError); PostErrorNotification(flags.raw, 0, NotifierStatus::GenericError);
return NvResult::BadParameter; return NvResult::BadParameter;
} }