From a4a2928905f3df67ed0eccba3e979f2ba6cab248 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Mon, 11 Jan 2016 23:50:26 +0100
Subject: [PATCH] FifoPlayer: Sleep while high watermark is set.

---
 Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 32 ++++++++++++++++++----
 Source/Core/Core/FifoPlayer/FifoPlayer.h   |  3 ++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
index b80418ee94..340b3b3c09 100644
--- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
@@ -82,9 +82,6 @@ bool FifoPlayer::Play()
 				if (m_Loop)
 				{
 					m_CurrentFrame = m_FrameRangeStart;
-
-					PowerPC::ppcState.downcount = 0;
-					CoreTiming::Advance();
 				}
 				else
 				{
@@ -233,6 +230,13 @@ void FifoPlayer::WriteFrame(const FifoFrameInfo& frame, const AnalyzedFrameInfo&
 	WriteFramePart(position, frame.fifoDataSize, memoryUpdate, frame, info);
 
 	FlushWGP();
+
+	// Sleep while the GPU is active
+	while (!IsIdleSet())
+	{
+		CoreTiming::Idle();
+		CoreTiming::Advance();
+	}
 }
 
 void FifoPlayer::WriteFramePart(u32 dataStart, u32 dataEnd, u32& nextMemUpdate, const FifoFrameInfo& frame, const AnalyzedFrameInfo& info)
@@ -300,6 +304,12 @@ void FifoPlayer::WriteFifo(u8* data, u32 start, u32 end)
 	// Write up to 256 bytes at a time
 	while (written < end)
 	{
+		while (IsHighWatermarkSet())
+		{
+			CoreTiming::Idle();
+			CoreTiming::Advance();
+		}
+
 		u32 burstEnd = std::min(written + 255, lastBurstEnd);
 
 		while (written < burstEnd)
@@ -330,8 +340,8 @@ void FifoPlayer::SetupFifo()
 	WriteCP(CommandProcessor::FIFO_END_LO, frame.fifoEnd);
 	WriteCP(CommandProcessor::FIFO_END_HI, frame.fifoEnd >> 16);
 
-	// Set watermarks
-	u32 hi_watermark = frame.fifoEnd - frame.fifoStart;
+	// Set watermarks, high at 75%, low at 0%
+	u32 hi_watermark = (frame.fifoEnd - frame.fifoStart) * 3 / 4;
 	WriteCP(CommandProcessor::FIFO_HI_WATERMARK_LO, hi_watermark);
 	WriteCP(CommandProcessor::FIFO_HI_WATERMARK_HI, hi_watermark >> 16);
 	WriteCP(CommandProcessor::FIFO_LO_WATERMARK_LO, 0);
@@ -479,3 +489,15 @@ bool FifoPlayer::ShouldLoadBP(u8 address)
 		return true;
 	}
 }
+
+bool FifoPlayer::IsIdleSet()
+{
+	CommandProcessor::UCPStatusReg status = PowerPC::Read_U16(0xCC000000 | CommandProcessor::STATUS_REGISTER);
+	return status.CommandIdle;
+}
+
+bool FifoPlayer::IsHighWatermarkSet()
+{
+	CommandProcessor::UCPStatusReg status = PowerPC::Read_U16(0xCC000000 | CommandProcessor::STATUS_REGISTER);
+	return status.OverflowHiWatermark;
+}
diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.h b/Source/Core/Core/FifoPlayer/FifoPlayer.h
index ff484dc6bb..a61ab7cc86 100644
--- a/Source/Core/Core/FifoPlayer/FifoPlayer.h
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.h
@@ -113,6 +113,9 @@ private:
 
 	bool ShouldLoadBP(u8 address);
 
+	static bool IsIdleSet();
+	static bool IsHighWatermarkSet();
+
 	bool m_Loop;
 
 	u32 m_CurrentFrame;