Skip to content

Fix Rosalina menu freeze caused by race condition with GSP/GPU #2232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RedShyGuy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Rosalina menu freeze caused by race condition with GSP/GPU #2232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions sysmodules/rosalina/source/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,39 @@ void menuEnter(void)
{
menuCloseRequested = false;
menuRefCount++;
svcKernelSetState(0x10000, 2 | 1);

// Phase 1: Freeze game/app threads to stop new GPU command submissions
svcKernelSetState(0x10000, 1);
svcSleepThread(5 * 1000 * 100LL);

// Phase 2: Wait for GPU + GSP to fully drain. After the game
// is frozen, GSP may still have multiple queued commands in
// its FIFO to submit one-by-one to the GPU hardware. A single
// busy-wait can pass while GSP is between commands (GPU idle
// but next command not yet submitted). Loop until GPU stays
// idle after giving GSP time to process, confirming the FIFO
// is fully drained and all completion interrupts delivered.
for (int i = 0; i < 8; i++)
{
while((GPU_PSC0_CNT | GPU_PSC1_CNT | GPU_TRANSFER_CNT | GPU_CMDLIST_CNT) & 1);
svcSleepThread(2 * 1000 * 1000LL);
if (!((GPU_PSC0_CNT | GPU_PSC1_CNT | GPU_TRANSFER_CNT | GPU_CMDLIST_CNT) & 1))
break;
}
// Final margin for GSP to process the last completion interrupt
svcSleepThread(1 * 1000 * 1000LL);

// Phase 3: Now freeze GSP (no pending completions to lose)
svcKernelSetState(0x10000, 2);
svcSleepThread(5 * 1000 * 100LL);

if (R_FAILED(Draw_AllocateFramebufferCache(FB_BOTTOM_SIZE)))
{
// Oops
menuRefCount = 0;
svcKernelSetState(0x10000, 2 | 1);
svcKernelSetState(0x10000, 2);
svcSleepThread(5 * 1000 * 100LL);
svcKernelSetState(0x10000, 1);
svcSleepThread(5 * 1000 * 100LL);
}
else
Expand All @@ -427,7 +453,12 @@ void menuLeave(void)
{
Draw_RestoreFramebuffer();
Draw_FreeFramebufferCache();
svcKernelSetState(0x10000, 2 | 1);

// Unfreeze GSP first so it can process any pending hardware
// interrupts before game threads resume and read the queue
svcKernelSetState(0x10000, 2);
svcSleepThread(2 * 1000 * 1000LL);
svcKernelSetState(0x10000, 1);
}
Draw_Unlock();
}
Expand Down