diff --git a/pcsx2/IPU/IPU.cpp b/pcsx2/IPU/IPU.cpp index 11f5df97b6..5571659dc9 100644 --- a/pcsx2/IPU/IPU.cpp +++ b/pcsx2/IPU/IPU.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2021 PCSX2 Dev Team + * Copyright (C) 2002-2022 PCSX2 Dev Team * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- @@ -191,8 +191,6 @@ __fi u32 ipuRead32(u32 mem) pxAssert((mem & ~0xff) == 0x10002000); mem &= 0xff; // ipu repeats every 0x100 - IPUProcessInterrupt(); - switch (mem) { ipucase(IPU_CMD) : // IPU_CMD @@ -243,8 +241,6 @@ __fi RETURNS_R64 ipuRead64(u32 mem) pxAssert((mem & ~0xff) == 0x10002000); mem &= 0xff; // ipu repeats every 0x100 - IPUProcessInterrupt(); - switch (mem) { ipucase(IPU_CMD): // IPU_CMD @@ -318,7 +314,6 @@ __fi bool ipuWrite32(u32 mem, u32 value) ipucase(IPU_CMD): // IPU_CMD IPU_LOG("write32: IPU_CMD=0x%08X", value); IPUCMD_WRITE(value); - IPUProcessInterrupt(); return false; ipucase(IPU_CTRL): // IPU_CTRL @@ -354,7 +349,6 @@ __fi bool ipuWrite64(u32 mem, u64 value) ipucase(IPU_CMD): IPU_LOG("write64: IPU_CMD=0x%08X", value); IPUCMD_WRITE((u32)value); - IPUProcessInterrupt(); return false; } @@ -928,7 +922,15 @@ __fi void IPUCMD_WRITE(u32 val) ipuRegs.ctrl.BUSY = 1; - //if(!ipu1ch.chcr.STR) hwIntcIrq(INTC_IPU); + // Have a short delay immitating the time it takes to run IDEC/BDEC, other commands are near instant. + // Mana Khemia/Metal Saga start IDEC then change IPU0 expecting there to be a delay before IDEC sends data. + if (!CommandExecuteQueued && (ipu_cmd.CMD == SCE_IPU_IDEC || ipu_cmd.CMD == SCE_IPU_BDEC)) + { + CommandExecuteQueued = true; + CPU_INT(IPU_PROCESS, 64); + } + else + IPUWorker(); } __noinline void IPUWorker() diff --git a/pcsx2/IPU/IPU_Fifo.cpp b/pcsx2/IPU/IPU_Fifo.cpp index 8507174b75..1c81164e51 100644 --- a/pcsx2/IPU/IPU_Fifo.cpp +++ b/pcsx2/IPU/IPU_Fifo.cpp @@ -178,6 +178,7 @@ void WriteFIFO_IPUin(const mem128_t* value) //committing every 16 bytes if( ipu_fifo.in.write((u32*)value, 1) == 0 ) { - IPUProcessInterrupt(); + CommandExecuteQueued = true; + CPU_INT(IPU_PROCESS, 1 * BIAS); } } diff --git a/pcsx2/IPU/IPUdma.cpp b/pcsx2/IPU/IPUdma.cpp index cf7430b920..d2221a43f1 100644 --- a/pcsx2/IPU/IPUdma.cpp +++ b/pcsx2/IPU/IPUdma.cpp @@ -188,7 +188,7 @@ void IPU0dma() IPU_INT_FROM( readsize * BIAS ); - if (ipu0ch.qwc > 0) + if (ipu0ch.qwc > 0 && !CommandExecuteQueued) { CommandExecuteQueued = true; CPU_INT(IPU_PROCESS, 4);