From af417c93d078a3d29ff657180e9b3375b7f99242 Mon Sep 17 00:00:00 2001
From: Eladash <elad3356p@gmail.com>
Date: Fri, 4 Oct 2019 15:37:49 +0300
Subject: [PATCH] cellGemUpdateStart/Finish error checking improved

* camera_frame = NULL is now checked for CELL_GEM_NO_VIDEO (applied both on start and finish)
* camera_frame = NULL on Start() still starts the update
* Implemented NOT_FINISHED/STARTED

All of those were reversed and hw tested.
---
 rpcs3/Emu/Cell/Modules/cellGem.cpp | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp
index a15bf0bfe0..c8db5944f9 100644
--- a/rpcs3/Emu/Cell/Modules/cellGem.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp
@@ -104,6 +104,10 @@ struct gem_config
 
 	std::array<gem_controller, CELL_GEM_MAX_NUM> controllers;
 	u32 connected_controllers;
+	bool update_started{};
+	u32 camera_frame{};
+
+	shared_mutex mtx;
 
 	Timer timer;
 
@@ -1064,6 +1068,18 @@ error_code cellGemUpdateFinish()
 		return CELL_GEM_ERROR_UNINITIALIZED;
 	}
 
+	std::scoped_lock lock(gem->mtx);
+
+	if (!std::exchange(gem->update_started, false))
+	{
+		return CELL_GEM_ERROR_UPDATE_NOT_STARTED;
+	}
+
+	if (!gem->camera_frame)
+	{
+		return CELL_GEM_NO_VIDEO;
+	}
+
 	return CELL_OK;
 }
 
@@ -1078,9 +1094,18 @@ error_code cellGemUpdateStart(vm::cptr<void> camera_frame, u64 timestamp)
 		return CELL_GEM_ERROR_UNINITIALIZED;
 	}
 
+	std::scoped_lock lock(gem->mtx);
+
+	// Update is starting even when camera_frame is null
+	if (std::exchange(gem->update_started, true))
+	{
+		return CELL_GEM_ERROR_UPDATE_NOT_FINISHED;
+	}
+
+	gem->camera_frame = camera_frame.addr();
 	if (!camera_frame)
 	{
-		return CELL_GEM_ERROR_INVALID_PARAMETER;
+		return CELL_GEM_NO_VIDEO;
 	}
 
 	return CELL_OK;