From ac104a24d11c5875e25daee5dd405ee9fe5f3a21 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Sat, 30 Oct 2021 11:35:05 +0200
Subject: NvHost: Try a different approach to blocking.

---
 src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp')

diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index a3c11ad8a..bfe1faf48 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -91,7 +91,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(), &params, sizeof(params));
-        events_interface.failed[event_id] = false;
+        events_interface.fails[event_id] = 0;
         return NvResult::Success;
     }
 
@@ -99,29 +99,26 @@ 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(), &params, sizeof(params));
-        events_interface.failed[event_id] = false;
+        events_interface.fails[event_id] = 0;
         return NvResult::Success;
     }
 
-    auto& event = events_interface.events[event_id];
     auto& gpu = system.GPU();
-    const u32 current_syncpoint_value = event.fence.value;
-    const s32 diff = current_syncpoint_value - params.threshold;
-    const u32 target_value = params.value;
+    const u32 target_value = syncpoint_manager.GetSyncpointMax(params.syncpt_id);
 
     if (!is_async) {
         params.value = 0;
     }
 
     const auto check_failing = [&]() {
-        if (events_interface.failed[event_id]) {
+        if (events_interface.fails[event_id] > 1) {
             {
                 auto lk = system.StallProcesses();
                 gpu.WaitFence(params.syncpt_id, target_value);
                 system.UnstallProcesses();
             }
             std::memcpy(output.data(), &params, sizeof(params));
-            events_interface.failed[event_id] = false;
+            events_interface.fails[event_id] = 0;
             return true;
         }
         return false;
@@ -207,7 +204,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;
+    events_interface.fails[event_id]++;
 
     syncpoint_manager.RefreshSyncpoint(events_interface.events[event_id].fence.id);
 
-- 
cgit v1.2.3