mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-12 00:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

sys_rsx: Warn if RSX is not idle during crucial points

Browse Source
This commit is contained in:
Eladash 2020-04-10 22:25:59 +03:00 committed by kd-11
parent 1f9f455801
commit 8228fa1ece
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rpcs3/Emu/Cell/lv2/sys_rsx.cpp
View File

@ -309,6 +309,11 @@ error_code sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 f
return CELL_EINVAL; return CELL_EINVAL;
} }
if (!render->is_fifo_idle())
{
sys_rsx.warning("sys_rsx_context_iomap(): RSX is not idle while mapping io");
}
vm::reader_lock rlock; vm::reader_lock rlock;
for (u32 addr = ea, end = ea + size; addr < end; addr += 0x100000) for (u32 addr = ea, end = ea + size; addr < end; addr += 0x100000)
@ -355,6 +360,11 @@ error_code sys_rsx_context_iounmap(u32 context_id, u32 io, u32 size)
return CELL_EINVAL; return CELL_EINVAL;
} }
if (!render->is_fifo_idle())
{
sys_rsx.warning("sys_rsx_context_iounmap(): RSX is not idle while unmapping io");
}
vm::reader_lock rlock; vm::reader_lock rlock;
std::scoped_lock lock(s_rsxmem_mtx); std::scoped_lock lock(s_rsxmem_mtx);
@ -549,6 +559,11 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
verify(HERE), a3 < std::size(render->tiles); verify(HERE), a3 < std::size(render->tiles);
if (!render->is_fifo_idle())
{
sys_rsx.warning("sys_rsx_context_attribute(): RSX is not idle while setting tile");
}
auto& tile = render->tiles[a3]; auto& tile = render->tiles[a3];
const u32 location = ((a4 >> 32) & 0x3) - 1; const u32 location = ((a4 >> 32) & 0x3) - 1;
@ -629,6 +644,11 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
verify(HERE), a3 < std::size(render->zculls); verify(HERE), a3 < std::size(render->zculls);
if (!render->is_fifo_idle())
{
sys_rsx.warning("sys_rsx_context_attribute(): RSX is not idle while setting zcull");
}
const u32 offset = (a5 & 0xFFFFFFFF); const u32 offset = (a5 & 0xFFFFFFFF);
const bool binded = (a6 & 0xFFFFFFFF) != 0; const bool binded = (a6 & 0xFFFFFFFF) != 0;

4
rpcs3/Emu/RSX/Capture/rsx_replay.cpp
View File

@ -200,7 +200,7 @@ namespace rsx
continue; continue;
// wait until rsx idle and at our first 'stop' to apply state // wait until rsx idle and at our first 'stop' to apply state
while (!Emu.IsStopped() && (render->ctrl->get != render->ctrl->put) && (render->ctrl->get != fifo_stops[stopIdx])) while (!Emu.IsStopped() && !render->is_fifo_idle() && (render->ctrl->get != fifo_stops[stopIdx]))
{ {
while (Emu.IsPaused()) while (Emu.IsPaused())
std::this_thread::sleep_for(10ms); std::this_thread::sleep_for(10ms);
@ -222,7 +222,7 @@ namespace rsx
u32 end = fifo_stops.back(); u32 end = fifo_stops.back();
render->ctrl->put = end; render->ctrl->put = end;
while (render->ctrl->get != end && !Emu.IsStopped()) while (!render->is_fifo_idle() && !Emu.IsStopped())
{ {
while (Emu.IsPaused()) while (Emu.IsPaused())
std::this_thread::sleep_for(10ms); std::this_thread::sleep_for(10ms);

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

@ -2262,6 +2262,11 @@ namespace rsx
zcull_ctrl->on_sync_hint(args); zcull_ctrl->on_sync_hint(args);
} }
bool thread::is_fifo_idle() const
{
return ctrl->get == (ctrl->put & ~3);
}
void thread::flush_fifo() void thread::flush_fifo()
{ {
// Make sure GET value is exposed before sync points // Make sure GET value is exposed before sync points

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

@ -622,6 +622,7 @@ namespace rsx
u32 restore_point = 0; u32 restore_point = 0;
atomic_t<u32> external_interrupt_lock{ 0 }; atomic_t<u32> external_interrupt_lock{ 0 };
atomic_t<bool> external_interrupt_ack{ false }; atomic_t<bool> external_interrupt_ack{ false };
bool is_fifo_idle() const;
void flush_fifo(); void flush_fifo();
void recover_fifo(); void recover_fifo();
static void fifo_wake_delay(u64 div = 1); static void fifo_wake_delay(u64 div = 1);