소스 검색

Merge pull request #5799 from ogniK5377/event-register-unregister

nvdrv: Unregister already registered events
bunnei 5 년 전
부모
커밋
2a2ee62cfd
1개의 변경된 파일7개의 추가작업 그리고 1개의 파일을 삭제
  1. 7 1
      src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp

+ 7 - 1
src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp

@@ -155,7 +155,13 @@ NvResult nvhost_ctrl::IocCtrlEventRegister(const std::vector<u8>& input, std::ve
         return NvResult::BadParameter;
     }
     if (events_interface.registered[event_id]) {
-        return NvResult::BadParameter;
+        const auto event_state = events_interface.status[event_id];
+        if (event_state != EventState::Free) {
+            LOG_WARNING(Service_NVDRV, "Event already registered! Unregistering previous event");
+            events_interface.UnregisterEvent(event_id);
+        } else {
+            return NvResult::BadParameter;
+        }
     }
     events_interface.RegisterEvent(event_id);
     return NvResult::Success;