archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Adjust FIFO recovery to be a bit more merciful

Browse source
This commit is contained in:
Eladash 2020-04-04 12:19:21 +03:00 • committed by Ivan
parent bbbd06dcee
commit e7d5d17fd8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -2272,12 +2272,12 @@ namespace rsx
{ {
const u64 current_time = get_system_time(); const u64 current_time = get_system_time();
if (recovered_fifo_cmds_history.size() == 9u) if (recovered_fifo_cmds_history.size() == 20u)
{ {
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 < 1'500'000u) if (current_time - cmd_info.timestamp < 2'000'000u)
{ {
// 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." HERE); fmt::throw_exception("Dead FIFO commands queue state has been detected!\nTry increasing \"Driver Wake-Up Delay\" setting in Advanced settings." HERE);
@ -2290,7 +2290,7 @@ namespace rsx
// Error. Should reset the queue // Error. Should reset the queue
fifo_ctrl->set_get(restore_point); fifo_ctrl->set_get(restore_point);
fifo_ret_addr = saved_fifo_ret; fifo_ret_addr = saved_fifo_ret;
std::this_thread::sleep_for(1ms); std::this_thread::sleep_for(2ms);
fifo_ctrl->abort(); fifo_ctrl->abort();
if (std::exchange(in_begin_end, false) && !rsx::method_registers.current_draw_clause.empty()) if (std::exchange(in_begin_end, false) && !rsx::method_registers.current_draw_clause.empty())