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

IPU: BDEC/IDEC wait for IPU0 to drain before proceeding

This commit is contained in:
refractionpcsx2 2021-12-24 03:09:37 +00:00
parent 06bf2502a6
commit eb9dc7b70d
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/IPU/IPU.cpp
View File

@ -998,6 +998,7 @@ __noinline void IPUWorker()
}
// success
IPU_LOG("IPU Command finished");
ipuRegs.ctrl.BUSY = 0;
//ipu_cmd.current = 0xffffffff;
hwIntcIrq(INTC_IPU);

30
pcsx2/IPU/mpeg2lib/Mpeg.cpp
View File

@ -698,6 +698,13 @@ __fi bool mpeg2sliceIDEC()
{
u16 code;
// If FROM_IPU is running and there's stuff in the output fifo
// wait for FROM_IPU to grab it.
// Tekken 4 does this then kills the IDEC command after IPU0 finishes
// so it expects no extra data to have been processed, the processing is probably triggered by Output FIFO requests
if (ipu0ch.chcr.STR && ipuRegs.ctrl.OFC)
return false;
switch (ipu_cmd.pos[0])
{
case 0:
@ -836,8 +843,12 @@ __fi bool mpeg2sliceIDEC()
ipu_cmd.pos[1] = 2;
return false;
}
mbaCount = 0;
else
{
mbaCount = 0;
ipu_cmd.pos[1] = 3;
return false;
}
}
[[fallthrough]];
@ -945,6 +956,13 @@ __fi bool mpeg2_slice()
{
int DCT_offset, DCT_stride;
// If FROM_IPU is running and there's stuff in the output fifo
// wait for FROM_IPU to grab it.
// Tekken 4 does this then kills the IDEC command after IPU0 finishes
// so it expects no extra data to have been processed, the processing is probably triggered by Output FIFO requests
if (ipu0ch.chcr.STR && ipuRegs.ctrl.OFC)
return false;
macroblock_8& mb8 = decoder.mb8;
macroblock_16& mb16 = decoder.mb16;
@ -1172,8 +1190,12 @@ __fi bool mpeg2_slice()
ipu_cmd.pos[0] = 3;
return false;
}
mbaCount = 0;
else
{
mbaCount = 0;
ipu_cmd.pos[0] = 4;
return false;
}
}
[[fallthrough]];