ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rsx: Improve rsx::recover_fifo() to take a hint from driver wake-up delay

This commit is contained in:
Eladash 2021-08-13 21:46:38 +03:00 committed by kd-11
parent 107641626a
commit a346767a72
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -2545,7 +2545,7 @@ namespace rsx
fifo_ctrl->sync_get(); fifo_ctrl->sync_get();
} }
void thread::recover_fifo() void thread::recover_fifo(u32 line, u32 col, const char* file, const char* func)
{ {
const u64 current_time = get_system_time(); const u64 current_time = get_system_time();
@ -2554,10 +2554,11 @@ namespace rsx
const auto cmd_info = recovered_fifo_cmds_history.front(); const auto cmd_info = recovered_fifo_cmds_history.front();
// Check timestamp of last tracked cmd // Check timestamp of last tracked cmd
if (current_time - cmd_info.timestamp < 2'000'000u) // Shorten the range of forbidden difference if driver wake-up delay is used
if (current_time - cmd_info.timestamp < 2'000'000u - std::min<u32>(g_cfg.video.driver_wakeup_delay * 700, 1'400'000))
{ {
// Probably hopeless // Probably hopeless
fmt::throw_exception("Dead FIFO commands queue state has been detected!\nTry increasing \"Driver Wake-Up Delay\" setting in Advanced settings."); fmt::throw_exception("Dead FIFO commands queue state has been detected!\nTry increasing \"Driver Wake-Up Delay\" setting in Advanced settings. Called from %s", src_loc{line, col, file, func});
} }
// Erase the last command from history, keep the size of the queue the same // Erase the last command from history, keep the size of the queue the same

7
rpcs3/Emu/RSX/RSXThread.h
View File

@ -653,7 +653,12 @@ namespace rsx
atomic_t<bool> is_inited{ false }; atomic_t<bool> is_inited{ false };
bool is_fifo_idle() const; bool is_fifo_idle() const;
void flush_fifo(); void flush_fifo();
void recover_fifo();
void recover_fifo(u32 line = __builtin_LINE(),
u32 col = __builtin_COLUMN(),
const char* file = __builtin_FILE(),
const char* func = __builtin_FUNCTION());
static void fifo_wake_delay(u64 div = 1); static void fifo_wake_delay(u64 div = 1);
u32 get_fifo_cmd() const; u32 get_fifo_cmd() const;