summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-06-08 21:13:26 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-05 21:49:17 +0200
commit78add28aabf0d9835336e5b4369b11308ab362e3 (patch)
tree19082d21977d65045723d171d146e3fb66f043b1 /src
parentGpu: Mark areas as protected. (diff)
downloadyuzu-78add28aabf0d9835336e5b4369b11308ab362e3.tar
yuzu-78add28aabf0d9835336e5b4369b11308ab362e3.tar.gz
yuzu-78add28aabf0d9835336e5b4369b11308ab362e3.tar.bz2
yuzu-78add28aabf0d9835336e5b4369b11308ab362e3.tar.lz
yuzu-78add28aabf0d9835336e5b4369b11308ab362e3.tar.xz
yuzu-78add28aabf0d9835336e5b4369b11308ab362e3.tar.zst
yuzu-78add28aabf0d9835336e5b4369b11308ab362e3.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp18
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.cpp2
2 files changed, 12 insertions, 8 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index 8e28c2fa4..5b1253f6b 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -102,6 +102,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
params.value = ((params.syncpt_id & 0xfff) << 16) | 0x10000000;
}
params.value |= event_id;
+ events_interface.events[event_id].writable->Clear();
gpu.RegisterEvent(event_id, params.syncpt_id, params.threshold);
std::memcpy(output.data(), &params, sizeof(params));
gpu.Guard(false);
@@ -115,26 +116,29 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
u32 nvhost_ctrl::IocCtrlEventRegister(const std::vector<u8>& input, std::vector<u8>& output) {
IocCtrlEventRegisterParams params{};
std::memcpy(&params, input.data(), sizeof(params));
- if (params.user_event_id >= MaxNvEvents) {
+ const u32 event_id = params.user_event_id & 0x00FF;
+ if (event_id >= MaxNvEvents) {
return NvResult::BadParameter;
}
- if (events_interface.registered[params.user_event_id]) {
+ if (events_interface.registered[event_id]) {
return NvResult::BadParameter;
}
- events_interface.RegisterEvent(params.user_event_id);
+ events_interface.RegisterEvent(event_id);
+ events_interface.events[event_id].writable->Signal();
return NvResult::Success;
}
u32 nvhost_ctrl::IocCtrlEventUnregister(const std::vector<u8>& input, std::vector<u8>& output) {
IocCtrlEventUnregisterParams params{};
std::memcpy(&params, input.data(), sizeof(params));
- if (params.user_event_id >= MaxNvEvents) {
+ const u32 event_id = params.user_event_id & 0x00FF;
+ if (event_id >= MaxNvEvents) {
return NvResult::BadParameter;
}
- if (!events_interface.registered[params.user_event_id]) {
+ if (!events_interface.registered[event_id]) {
return NvResult::BadParameter;
}
- events_interface.UnregisterEvent(params.user_event_id);
+ events_interface.UnregisterEvent(event_id);
return NvResult::Success;
}
@@ -142,7 +146,7 @@ u32 nvhost_ctrl::IocCtrlEventSignal(const std::vector<u8>& input, std::vector<u8
IocCtrlEventSignalParams params{};
std::memcpy(&params, input.data(), sizeof(params));
// TODO(Blinkhawk): This is normally called when an NvEvents timeout on WaitSynchronization
- // It is believed to cancel the GPU Event. However, better research is required
+ // It is believed from RE to cancel the GPU Event. However, better research is required
u32 event_id = params.user_event_id & 0x00FF;
LOG_WARNING(Service_NVDRV, "(STUBBED) called, user_event_id: {:X}", event_id);
if (event_id >= MaxNvEvents) {
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 618bcbc7c..3a716e734 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -40,7 +40,7 @@ Module::Module() {
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::Automatic, event_label);
+ kernel, Kernel::ResetType::Manual, event_label);
events_interface.status[i] = EventState::Free;
events_interface.registered[i] = false;
}