diff options
author | bunnei <bunneidev@gmail.com> | 2021-10-16 01:14:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-16 01:14:32 +0200 |
commit | aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5 (patch) | |
tree | 9ae1d8b30878562389498bd9f3b8ced582b6661d /src/core/hle | |
parent | Merge pull request #7189 from FearlessTobi/translation-ci (diff) | |
parent | NvHost/Core: Address Feedback. (diff) | |
download | yuzu-aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5.tar yuzu-aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5.tar.gz yuzu-aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5.tar.bz2 yuzu-aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5.tar.lz yuzu-aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5.tar.xz yuzu-aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5.tar.zst yuzu-aef3ae1cb93f962165b1f9596b95e4ffa4a5e9c5.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 14 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.h | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 8b4867ca7..f9b82b504 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -92,6 +92,7 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector if (syncpoint_manager.IsSyncpointExpired(params.syncpt_id, params.threshold)) { params.value = syncpoint_manager.GetSyncpointMin(params.syncpt_id); std::memcpy(output.data(), ¶ms, sizeof(params)); + events_interface.failed[event_id] = false; return NvResult::Success; } @@ -99,6 +100,7 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector syncpoint_manager.IsSyncpointExpired(params.syncpt_id, params.threshold)) { params.value = new_value; std::memcpy(output.data(), ¶ms, sizeof(params)); + events_interface.failed[event_id] = false; return NvResult::Success; } @@ -117,6 +119,7 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector event.event->GetWritableEvent().Signal(); params.value = current_syncpoint_value; std::memcpy(output.data(), ¶ms, sizeof(params)); + events_interface.failed[event_id] = false; return NvResult::Success; } const u32 target_value = current_syncpoint_value - diff; @@ -146,6 +149,16 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector } params.value |= event_id; event.event->GetWritableEvent().Clear(); + if (events_interface.failed[event_id]) { + { + auto lk = system.StallCPU(); + gpu.WaitFence(params.syncpt_id, target_value); + system.UnstallCPU(); + } + std::memcpy(output.data(), ¶ms, sizeof(params)); + events_interface.failed[event_id] = false; + return NvResult::Success; + } gpu.RegisterSyncptInterrupt(params.syncpt_id, target_value); std::memcpy(output.data(), ¶ms, sizeof(params)); return NvResult::Timeout; @@ -201,6 +214,7 @@ NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector<u8>& input, std::v if (events_interface.status[event_id] == EventState::Waiting) { events_interface.LiberateEvent(event_id); } + events_interface.failed[event_id] = true; syncpoint_manager.RefreshSyncpoint(events_interface.events[event_id].fence.id); diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index e2a1dde5b..a5af5b785 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -49,6 +49,8 @@ struct EventInterface { std::array<EventState, MaxNvEvents> status{}; // Tells if an NVEvent is registered or not std::array<bool, MaxNvEvents> registered{}; + // Tells the NVEvent that it has failed. + std::array<bool, MaxNvEvents> failed{}; // When an NVEvent is waiting on GPU interrupt, this is the sync_point // associated with it. std::array<u32, MaxNvEvents> assigned_syncpt{}; |