gpu: adjust timing again

maybe I should just give up...

diff --git a/libpcsxcore/gpu.h b/libpcsxcore/gpu.h
index 69474b4..c61986d 100644 (file)
--- a/libpcsxcore/gpu.h
+++ b/libpcsxcore/gpu.h
@@ -27,6 +27,7 @@
 #define PSXGPU_LCF     (1u<<31)
 #define PSXGPU_nBUSY   (1u<<26)
 #define PSXGPU_ILACE   (1u<<22)
+#define PSXGPU_RGB24   (1u<<21)
 #define PSXGPU_DHEIGHT (1u<<19)
 #define PSXGPU_FIELD   (1u<<13)
 

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index af791c0..e17cba3 100644 (file)
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -206,7 +206,8 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        HW_DMA2_MADR = SWAPu32(madr_next);
 
                        // timing hack with some lame heuristics
-                       if (Config.gpu_timing_override && (do_walking || cycles_sum > 64))
+                       if (Config.gpu_timing_override && (do_walking || cycles_sum > 64)
+                           && !(HW_GPU_STATUS & SWAP32(PSXGPU_DHEIGHT | PSXGPU_RGB24)))
                                cycles_sum = Config.gpu_timing_override;
 
                        psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
@@ -227,18 +228,20 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 void gpuInterrupt() {
        if (HW_DMA2_CHCR == SWAP32(0x01000401) && !(HW_DMA2_MADR & SWAP32(0x800000)))
        {
-               u32 madr_next = 0xffffff, madr = SWAPu32(HW_DMA2_MADR);
+               u32 madr_next = SWAPu32(HW_DMA2_MADR);
+               s32 cycles_sum = psxRegs.gpuIdleAfter - psxRegs.cycle;
                s32 cycles_last_cmd = 0;
-               long cycles_sum;
 
-               cycles_sum = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff,
-                               &madr_next, &cycles_last_cmd);
+               do {
+                       cycles_sum += cycles_last_cmd;
+                       cycles_sum += GPU_dmaChain((u32 *)psxM, madr_next & 0x1fffff,
+                                       &madr_next, &cycles_last_cmd);
+               }
+               while (cycles_sum <= 0 && !(madr_next & 0x800000));
                HW_DMA2_MADR = SWAPu32(madr_next);
-               if ((s32)(psxRegs.gpuIdleAfter - psxRegs.cycle) > 0)
-                       cycles_sum += psxRegs.gpuIdleAfter - psxRegs.cycle;
                psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
                set_event(PSXINT_GPUDMA, cycles_sum);
-               //printf("%u dma2cn: %6ld,%4d %08x\n", psxRegs.cycle, cycles_sum,
+               //printf("%u dma2cn: %6d,%4d %08x\n", psxRegs.cycle, cycles_sum,
                //  cycles_last_cmd, HW_DMA2_MADR);
                return;
        }

diff --git a/plugins/gpulib/gpu.c b/plugins/gpulib/gpu.c
index 9eb3178..4c9b7fa 100644 (file)
--- a/plugins/gpulib/gpu.c
+++ b/plugins/gpulib/gpu.c
@@ -805,7 +805,8 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr,
     addr = LE32TOH(list[0]) & 0xffffff;
     preload(rambase + (addr & 0x1fffff) / 4);
 
-    cpu_cycles_sum += 10;
+    cpu_cycles_sum += 10 + cpu_cycles_last;
+    cpu_cycles_last = 0;
     if (len > 0)
       cpu_cycles_sum += 5 + len;
 
@@ -831,8 +832,13 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr,
       }
     }
 
-    if (progress_addr && (cpu_cycles_last + cpu_cycles_sum > 512))
-      break;
+    if (progress_addr) {
+      // hack for bios boot logo race (must be not too fast or too slow)
+      if (gpu.status & PSX_GPU_STATUS_DHEIGHT)
+        cpu_cycles_sum += 5;
+      if (cpu_cycles_sum > 512)
+        break;
+    }
     if (addr == ld_addr) {
       log_anomaly(&gpu, "GPUdmaChain: loop @ %08x, cnt=%u\n", addr, count);
       break;