mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 18:29:08 +01:00
NVHost_Ctrl: Force wait if the gpu falls behind too long.
This commit is contained in:
parent
dc385b7392
commit
7dca0bc11d
2 changed files with 13 additions and 0 deletions
|
@ -92,6 +92,7 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector
|
||||||
if (syncpoint_manager.IsSyncpointExpired(params.syncpt_id, params.threshold)) {
|
if (syncpoint_manager.IsSyncpointExpired(params.syncpt_id, params.threshold)) {
|
||||||
params.value = syncpoint_manager.GetSyncpointMin(params.syncpt_id);
|
params.value = syncpoint_manager.GetSyncpointMin(params.syncpt_id);
|
||||||
std::memcpy(output.data(), ¶ms, sizeof(params));
|
std::memcpy(output.data(), ¶ms, sizeof(params));
|
||||||
|
events_interface.failed[event_id] = false;
|
||||||
return NvResult::Success;
|
return NvResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,6 +100,7 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector
|
||||||
syncpoint_manager.IsSyncpointExpired(params.syncpt_id, params.threshold)) {
|
syncpoint_manager.IsSyncpointExpired(params.syncpt_id, params.threshold)) {
|
||||||
params.value = new_value;
|
params.value = new_value;
|
||||||
std::memcpy(output.data(), ¶ms, sizeof(params));
|
std::memcpy(output.data(), ¶ms, sizeof(params));
|
||||||
|
events_interface.failed[event_id] = false;
|
||||||
return NvResult::Success;
|
return NvResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,6 +119,7 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector
|
||||||
event.event->GetWritableEvent().Signal();
|
event.event->GetWritableEvent().Signal();
|
||||||
params.value = current_syncpoint_value;
|
params.value = current_syncpoint_value;
|
||||||
std::memcpy(output.data(), ¶ms, sizeof(params));
|
std::memcpy(output.data(), ¶ms, sizeof(params));
|
||||||
|
events_interface.failed[event_id] = false;
|
||||||
return NvResult::Success;
|
return NvResult::Success;
|
||||||
}
|
}
|
||||||
const u32 target_value = current_syncpoint_value - diff;
|
const u32 target_value = current_syncpoint_value - diff;
|
||||||
|
@ -146,6 +149,13 @@ NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector
|
||||||
}
|
}
|
||||||
params.value |= event_id;
|
params.value |= event_id;
|
||||||
event.event->GetWritableEvent().Clear();
|
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);
|
gpu.RegisterSyncptInterrupt(params.syncpt_id, target_value);
|
||||||
std::memcpy(output.data(), ¶ms, sizeof(params));
|
std::memcpy(output.data(), ¶ms, sizeof(params));
|
||||||
return NvResult::Timeout;
|
return NvResult::Timeout;
|
||||||
|
@ -201,6 +211,7 @@ NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector<u8>& input, std::v
|
||||||
if (events_interface.status[event_id] == EventState::Waiting) {
|
if (events_interface.status[event_id] == EventState::Waiting) {
|
||||||
events_interface.LiberateEvent(event_id);
|
events_interface.LiberateEvent(event_id);
|
||||||
}
|
}
|
||||||
|
events_interface.failed[event_id] = true;
|
||||||
|
|
||||||
syncpoint_manager.RefreshSyncpoint(events_interface.events[event_id].fence.id);
|
syncpoint_manager.RefreshSyncpoint(events_interface.events[event_id].fence.id);
|
||||||
|
|
||||||
|
|
|
@ -49,6 +49,8 @@ struct EventInterface {
|
||||||
std::array<EventState, MaxNvEvents> status{};
|
std::array<EventState, MaxNvEvents> status{};
|
||||||
// Tells if an NVEvent is registered or not
|
// Tells if an NVEvent is registered or not
|
||||||
std::array<bool, MaxNvEvents> registered{};
|
std::array<bool, MaxNvEvents> registered{};
|
||||||
|
// Tells the NVEvent that it has failed.
|
||||||
|
std::array<bool, MaxNvEvents> failed{};
|
||||||
// When an NVEvent is waiting on GPU interrupt, this is the sync_point
|
// When an NVEvent is waiting on GPU interrupt, this is the sync_point
|
||||||
// associated with it.
|
// associated with it.
|
||||||
std::array<u32, MaxNvEvents> assigned_syncpt{};
|
std::array<u32, MaxNvEvents> assigned_syncpt{};
|
||||||
|
|
Loading…
Reference in a new issue