Video: implement nvhost_ctrl::IocCtrlClearEventWait

Author: N3xoX1

src/nxemu-module-spec/base.h

@@ -17,7 +17,7 @@
 enum
 {
     MODULE_LOADER_SPECS_VERSION = 0x0108,
-    MODULE_VIDEO_SPECS_VERSION = 0x0109,
+    MODULE_VIDEO_SPECS_VERSION = 0x010A,
     MODULE_CPU_SPECS_VERSION = 0x0104,
     MODULE_OPERATING_SYSTEM_SPECS_VERSION = 0x0109,
 };

src/nxemu-module-spec/video.h

@@ -63,6 +63,7 @@ __interface IVideo
     void ApplyOpOnDeviceMemoryPointer(const uint8_t * pointer, uint32_t * scratchBuffer, size_t scratchBufferSize, DeviceMemoryOperation operation, void * userData) = 0;
     RasterizerDownloadArea OnCPURead(uint64_t addr, uint64_t size) = 0;
     bool OnCPUWrite(uint64_t addr, uint64_t size) = 0;
+    void DeregisterHostAction(uint32_t syncpoint_id, uint32_t handle) = 0;
     uint32_t HostSyncpointValue(uint32_t id) = 0;
     uint32_t HostSyncpointRegisterAction(uint32_t fence_id, uint32_t target_value, HostActionCallback operation, uint32_t slot, void * userData) = 0;
 };

src/nxemu-os/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp

@@ -260,7 +260,26 @@ NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(IocCtrlEventUnregisterBatchPar
 }
 
 NvResult nvhost_ctrl::IocCtrlClearEventWait(IocCtrlEventClearParams& params) {
-    UNIMPLEMENTED();
+    u32 event_id = params.event_id.slot;
+    LOG_DEBUG(Service_NVDRV, "called, event_id: {:X}", event_id);
+
+    if (event_id >= MaxNvEvents) {
+        return NvResult::BadParameter;
+    }
+
+    auto lock = NvEventsLock();
+
+    auto& event = events[event_id];
+    if (event.status.exchange(EventState::Cancelling, std::memory_order_acq_rel) ==
+        EventState::Waiting) {
+        system.GetVideo().DeregisterHostAction(event.assigned_syncpt, event.wait_handle);
+        syncpoint_manager.UpdateMin(event.assigned_syncpt);
+        event.wait_handle = {};
+    }
+    event.fails++;
+    event.status.store(EventState::Cancelled, std::memory_order_release);
+    event.kevent->Clear();
+
     return NvResult::Success;
 }
 

src/nxemu-video/video_manager.cpp

@@ -183,6 +183,11 @@ bool VideoManager::OnCPUWrite(uint64_t addr, uint64_t size)
     return impl->m_gpuCore->OnCPUWrite(addr, size);
 }
 
+void VideoManager::DeregisterHostAction(uint32_t syncpoint_id, uint32_t handle)
+{
+    impl->m_host1x->GetSyncpointManager().DeregisterHostAction(syncpoint_id, handle);
+}
+
 uint32_t VideoManager::HostSyncpointValue(uint32_t id)
 {
     return impl->m_host1x->GetSyncpointManager().GetHostSyncpointValue(id);

src/nxemu-video/video_manager.h

@@ -33,6 +33,7 @@ class VideoManager :
     void ApplyOpOnDeviceMemoryPointer(const uint8_t * pointer, uint32_t* scratchBuffer, size_t scratchBufferSize, DeviceMemoryOperation operation, void* userData) override;
     RasterizerDownloadArea OnCPURead(uint64_t addr, uint64_t size) override;
     bool OnCPUWrite(uint64_t addr, uint64_t size) override;
+    void DeregisterHostAction(uint32_t syncpoint_id, uint32_t handle) override;
     uint32_t HostSyncpointValue(uint32_t id) override;
     uint32_t HostSyncpointRegisterAction(uint32_t fence_id, uint32_t target_value, HostActionCallback operation, uint32_t slot, void * userData) override;