Skip to content

Commit

Permalink
rsx: Adjust FIFO recovery to be a bit more merciful
Browse files Browse the repository at this point in the history
  • Loading branch information
elad335 authored and Nekotekina committed Apr 5, 2020
1 parent bbbd06d commit e7d5d17
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rpcs3/Emu/RSX/RSXThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2272,12 +2272,12 @@ namespace rsx
{
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();

// 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
fmt::throw_exception("Dead FIFO commands queue state has been detected!\nTry increasing \"Driver Wake-Up Delay\" setting in Advanced settings." HERE);
Expand All @@ -2290,7 +2290,7 @@ namespace rsx
// Error. Should reset the queue
fifo_ctrl->set_get(restore_point);
fifo_ret_addr = saved_fifo_ret;
std::this_thread::sleep_for(1ms);
std::this_thread::sleep_for(2ms);
fifo_ctrl->abort();

if (std::exchange(in_begin_end, false) && !rsx::method_registers.current_draw_clause.empty())
Expand Down

0 comments on commit e7d5d17

Please sign in to comment.