From c6119c210afd8f0f262a78796d0703c81864cca3 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 11 Jan 2020 13:40:01 +1000 Subject: [PATCH] Revert "DMA: Delay GPU transfers by block count" This reverts commit 0639f4264f0b9b40d99e0e5ce40f4eda91bc881d. Breaks FF7's FMVs in the top row. Needs GPU timings. --- src/core/dma.cpp | 9 --------- src/core/dma.h | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/core/dma.cpp b/src/core/dma.cpp index e8c735a76..646b019fa 100644 --- a/src/core/dma.cpp +++ b/src/core/dma.cpp @@ -197,15 +197,6 @@ TickCount DMA::GetTransferDelay(Channel channel) const } break; - case Channel::GPU: - { - if (cs.channel_control.sync_mode == SyncMode::Request) - return cs.block_control.request.GetBlockCount(); - else - return 1; - } - break; - default: return 1; } diff --git a/src/core/dma.h b/src/core/dma.h index 2781301bf..dc66b77ca 100644 --- a/src/core/dma.h +++ b/src/core/dma.h @@ -54,6 +54,7 @@ public: private: static constexpr PhysicalMemoryAddress BASE_ADDRESS_MASK = UINT32_C(0x00FFFFFF); static constexpr PhysicalMemoryAddress ADDRESS_MASK = UINT32_C(0x001FFFFC); + static constexpr u32 TRANSFER_TICKS = 10; enum class SyncMode : u32 {