diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-06-17 21:27:42 +0200 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-07-05 21:49:29 +0200 |
commit | 0335a25d1fcca5328ef79b3c62edb679df63ffba (patch) | |
tree | 0eec4de7bba608839dfad8ee0501caa1d21cc009 /src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | |
parent | NVServices: Correct CtrlEventWaitSync to block the ipc until timeout. (diff) | |
download | yuzu-0335a25d1fcca5328ef79b3c62edb679df63ffba.tar yuzu-0335a25d1fcca5328ef79b3c62edb679df63ffba.tar.gz yuzu-0335a25d1fcca5328ef79b3c62edb679df63ffba.tar.bz2 yuzu-0335a25d1fcca5328ef79b3c62edb679df63ffba.tar.lz yuzu-0335a25d1fcca5328ef79b3c62edb679df63ffba.tar.xz yuzu-0335a25d1fcca5328ef79b3c62edb679df63ffba.tar.zst yuzu-0335a25d1fcca5328ef79b3c62edb679df63ffba.zip |
Diffstat (limited to 'src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index e46e6b94c..ffa6e75c7 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -142,7 +142,6 @@ u32 nvhost_ctrl::IocCtrlEventRegister(const std::vector<u8>& input, std::vector< return NvResult::BadParameter; } events_interface.RegisterEvent(event_id); - events_interface.events[event_id].writable->Signal(); return NvResult::Success; } @@ -171,7 +170,11 @@ u32 nvhost_ctrl::IocCtrlEventSignal(const std::vector<u8>& input, std::vector<u8 return NvResult::BadParameter; } if (events_interface.status[event_id] == EventState::Waiting) { - events_interface.LiberateEvent(event_id); + auto& gpu = system.GPU(); + if (gpu.CancelSyncptInterrupt(events_interface.assigned_syncpt[event_id], + events_interface.assigned_value[event_id])) { + events_interface.LiberateEvent(event_id); + } } return NvResult::Success; } |