summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-06-17 21:27:42 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-05 21:49:29 +0200
commit0335a25d1fcca5328ef79b3c62edb679df63ffba (patch)
tree0eec4de7bba608839dfad8ee0501caa1d21cc009 /src/core
parentNVServices: Correct CtrlEventWaitSync to block the ipc until timeout. (diff)
downloadyuzu-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')
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp7
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.cpp4
2 files changed, 7 insertions, 4 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;
}
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 598a1123b..8958e21e3 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -40,8 +40,8 @@ Module::Module(Core::System& system) {
auto& kernel = system.Kernel();
for (u32 i = 0; i < MaxNvEvents; i++) {
std::string event_label = fmt::format("NVDRV::NvEvent_{}", i);
- events_interface.events[i] =
- Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Manual, event_label);
+ events_interface.events[i] = Kernel::WritableEvent::CreateEventPair(
+ kernel, Kernel::ResetType::Automatic, event_label);
events_interface.status[i] = EventState::Free;
events_interface.registered[i] = false;
}