From 7dca0bc11ddcbbd38b2cc46b5fc8c0842df5f483 Mon Sep 17 00:00:00 2001 From: FernandoS27 Date: Tue, 5 Oct 2021 22:57:18 +0200 Subject: NVHost_Ctrl: Force wait if the gpu falls behind too long. --- src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 11 +++++++++++ src/core/hle/service/nvdrv/nvdrv.h | 2 ++ 2 files changed, 13 insertions(+) (limited to 'src/core/hle') diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 8b4867ca7..8bbb2c06e 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& 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& 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& 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,13 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector } params.value |= event_id; event.event->GetWritableEvent().Clear(); + if (events_interface.failed[event_id]) { + lock.unlock(); + gpu.WaitFence(params.syncpt_id, target_value); + 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 +211,7 @@ NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector& 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 status{}; // Tells if an NVEvent is registered or not std::array registered{}; + // Tells the NVEvent that it has failed. + std::array failed{}; // When an NVEvent is waiting on GPU interrupt, this is the sync_point // associated with it. std::array assigned_syncpt{}; -- cgit v1.2.3 From 198c6ad0d728447dc97e467c8fb08f0b54c8a742 Mon Sep 17 00:00:00 2001 From: FernandoS27 Date: Tue, 5 Oct 2021 23:54:33 +0200 Subject: Suspend temporally --- src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core/hle') diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 8bbb2c06e..b59eae55c 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -150,8 +150,9 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector params.value |= event_id; event.event->GetWritableEvent().Clear(); if (events_interface.failed[event_id]) { - lock.unlock(); + system.stallForGPU(true); gpu.WaitFence(params.syncpt_id, target_value); + system.stallForGPU(false); std::memcpy(output.data(), ¶ms, sizeof(params)); events_interface.failed[event_id] = false; return NvResult::Success; -- cgit v1.2.3 From 53cf91d151d1e3d289917b63cf17ca254674f1ce Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 16 Oct 2021 00:20:19 +0200 Subject: NvHost/Core: Address Feedback. --- src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/core/hle') diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index b59eae55c..f9b82b504 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -150,9 +150,11 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector params.value |= event_id; event.event->GetWritableEvent().Clear(); if (events_interface.failed[event_id]) { - system.stallForGPU(true); - gpu.WaitFence(params.syncpt_id, target_value); - system.stallForGPU(false); + { + 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; -- cgit v1.2.3