From 1df111b68a3f2ba93ac679d6f93ac0ff3192781c Mon Sep 17 00:00:00 2001
From: citrabot <citra@citra-emu.org>
Date: Sun, 3 Mar 2024 00:26:10 +0000
Subject: [PATCH] Merge PR 7472

---
 src/core/hle/service/cam/y2r_u.cpp | 11 +++++++++--
 src/core/hle/service/cam/y2r_u.h   |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/core/hle/service/cam/y2r_u.cpp b/src/core/hle/service/cam/y2r_u.cpp
index 266cf2e92..ff5dddfff 100644
--- a/src/core/hle/service/cam/y2r_u.cpp
+++ b/src/core/hle/service/cam/y2r_u.cpp
@@ -522,7 +522,9 @@ void Y2R_U::StartConversion(Kernel::HLERequestContext& ctx) {
 
     HW::Y2R::PerformConversion(system.Memory(), conversion);
 
-    completion_event->Signal();
+    static constexpr s64 MinY2RDelay = 10000;
+    system.CoreTiming().ScheduleEvent(MinY2RDelay, completion_signal_event);
+    is_busy_conversion = true;
 
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
     rb.Push(ResultSuccess);
@@ -544,7 +546,7 @@ void Y2R_U::IsBusyConversion(Kernel::HLERequestContext& ctx) {
 
     IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
     rb.Push(ResultSuccess);
-    rb.Push<u8>(0); // StartConversion always finishes immediately
+    rb.Push(is_busy_conversion);
 
     LOG_DEBUG(Service_Y2R, "called");
 }
@@ -697,6 +699,11 @@ Y2R_U::Y2R_U(Core::System& system) : ServiceFramework("y2r:u", 1), system(system
     RegisterHandlers(functions);
 
     completion_event = system.Kernel().CreateEvent(Kernel::ResetType::OneShot, "Y2R:Completed");
+    completion_signal_event =
+        system.CoreTiming().RegisterEvent("Y2R Completion Signal Event", [this](uintptr_t, s64) {
+            completion_event->Signal();
+            is_busy_conversion = false;
+        });
 }
 
 Y2R_U::~Y2R_U() = default;
diff --git a/src/core/hle/service/cam/y2r_u.h b/src/core/hle/service/cam/y2r_u.h
index b8757cd77..f15af8c40 100644
--- a/src/core/hle/service/cam/y2r_u.h
+++ b/src/core/hle/service/cam/y2r_u.h
@@ -349,11 +349,13 @@ private:
     Core::System& system;
 
     std::shared_ptr<Kernel::Event> completion_event;
+    Core::TimingEventType* completion_signal_event;
     ConversionConfiguration conversion{};
     DitheringWeightParams dithering_weight_params{};
     bool temporal_dithering_enabled = false;
     bool transfer_end_interrupt_enabled = false;
     bool spacial_dithering_enabled = false;
+    bool is_busy_conversion = false;
 
     template <class Archive>
     void serialize(Archive& ar, const unsigned int);