X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxdma.c;h=4db99ab1ebe00d5e8c3c4aab9d99bd58f8cdb777;hb=f8896d181bd26ef6fd18af17f01c77b73ae17a68;hp=24570968dd07cba6d2593845b50cbabdff82ce15;hpb=7da5c7ad699ce52d0ef8361709b420751f4e42e0;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 24570968..4db99ab1 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -157,7 +157,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			HW_DMA2_MADR = SWAPu32(madr + words_copy * 4);
 
 			// careful: gpu_state_change() also messes with this
-			HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
+			psxRegs.gpuIdleAfter = psxRegs.cycle + words / 4 + 16;
 			// already 32-bit word size ((size * 4) / 4)
 			set_event(PSXINT_GPUDMA, words / 4);
 			return;
@@ -180,7 +180,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			HW_DMA2_MADR = SWAPu32(madr);
 
 			// careful: gpu_state_change() also messes with this
-			HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
+			psxRegs.gpuIdleAfter = psxRegs.cycle + words / 4 + 16;
 			// already 32-bit word size ((size * 4) / 4)
 			set_event(PSXINT_GPUDMA, words / 4);
 			return;
@@ -199,13 +199,13 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			if ((int)size <= 0)
 				size = gpuDmaChainSize(madr);
 
-			HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
 			HW_DMA2_MADR = SWAPu32(madr_next);
 
 			// Tekken 3 = use 1.0 only (not 1.5x)
 
 			// Einhander = parse linked list in pieces (todo)
 			// Rebel Assault 2 = parse linked list in pieces (todo)
+			psxRegs.gpuIdleAfter = psxRegs.cycle + size + 16;
 			set_event(PSXINT_GPUDMA, size);
 			return;
 
@@ -218,14 +218,13 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 	DMA_INTERRUPT(2);
 }
 
-// note: this is also (ab)used for non-dma prim command
-// to delay gpu returning to idle state, see gpu_state_change()
 void gpuInterrupt() {
 	if (HW_DMA2_CHCR == SWAP32(0x01000401) && !(HW_DMA2_MADR & SWAP32(0x800000)))
 	{
 		u32 size, madr_next = 0xffffff;
 		size = GPU_dmaChain((u32 *)psxM, HW_DMA2_MADR & 0x1fffff, &madr_next);
 		HW_DMA2_MADR = SWAPu32(madr_next);
+		psxRegs.gpuIdleAfter = psxRegs.cycle + size + 64;
 		set_event(PSXINT_GPUDMA, size);
 		return;
 	}
@@ -234,7 +233,6 @@ void gpuInterrupt() {
 		HW_DMA2_CHCR &= SWAP32(~0x01000000);
 		DMA_INTERRUPT(2);
 	}
-	HW_GPU_STATUS |= SWAP32(PSXGPU_nBUSY); // GPU no longer busy
 }
 
 void psxDma6(u32 madr, u32 bcr, u32 chcr) {