From b566ad28a3910e1b80091134e2ea9de9b0a54241 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Thu, 6 Jul 2023 12:03:31 +0200
Subject: add regression revert patch Thanks GloriousEggroll for triaging it
 and providing these

---
 ...-da2d907e051d591717d00e28e67ab341b961fd05.patch | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 SOURCES/0003-Revert-da2d907e051d591717d00e28e67ab341b961fd05.patch

(limited to 'SOURCES/0003-Revert-da2d907e051d591717d00e28e67ab341b961fd05.patch')

diff --git a/SOURCES/0003-Revert-da2d907e051d591717d00e28e67ab341b961fd05.patch b/SOURCES/0003-Revert-da2d907e051d591717d00e28e67ab341b961fd05.patch
new file mode 100644
index 0000000..d50d2f9
--- /dev/null
+++ b/SOURCES/0003-Revert-da2d907e051d591717d00e28e67ab341b961fd05.patch
@@ -0,0 +1,68 @@
+From 2807b9c336cf5df749e18a258c44669db55bc30e Mon Sep 17 00:00:00 2001
+From: GloriousEggroll <gloriouseggroll@gmail.com>
+Date: Wed, 5 Jul 2023 16:02:36 -0600
+Subject: [PATCH 3/3] Revert da2d907e051d591717d00e28e67ab341b961fd05
+
+---
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 +++++++++----------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index ae58f24be..289c261ff 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -2683,12 +2683,10 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state,
+ 			bundle->surface_updates[m].surface->force_full_update =
+ 				true;
+ 		}
+-
+-		dc_update_planes_and_stream(dm->dc,
+-			bundle->surface_updates,
++		dc_commit_updates_for_stream(
++			dm->dc, bundle->surface_updates,
+ 			dc_state->stream_status->plane_count,
+-			dc_state->streams[k],
+-			&bundle->stream_update);
++			dc_state->streams[k], &bundle->stream_update, dc_state);
+ 	}
+ 
+ cleanup:
+@@ -8200,11 +8198,12 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ 				acrtc_state->stream->link->psr_settings.psr_allow_active)
+ 			amdgpu_dm_psr_disable(acrtc_state->stream);
+ 
+-		dc_update_planes_and_stream(dm->dc,
+-					    bundle->surface_updates,
+-					    planes_count,
+-					    acrtc_state->stream,
+-					    &bundle->stream_update);
++		dc_commit_updates_for_stream(dm->dc,
++						     bundle->surface_updates,
++						     planes_count,
++						     acrtc_state->stream,
++						     &bundle->stream_update,
++						     dc_state);
+ 
+ 		/**
+ 		 * Enable or disable the interrupts on the backend.
+@@ -8742,11 +8741,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
+ 
+ 
+ 		mutex_lock(&dm->dc_lock);
+-		dc_update_planes_and_stream(dm->dc,
+-					    dummy_updates,
+-					    status->plane_count,
+-					    dm_new_crtc_state->stream,
+-					    &stream_update);
++		dc_commit_updates_for_stream(dm->dc,
++						     dummy_updates,
++						     status->plane_count,
++						     dm_new_crtc_state->stream,
++						     &stream_update,
++						     dc_state);
+ 		mutex_unlock(&dm->dc_lock);
+ 	}
+ 
+-- 
+2.41.0
+
-- 
cgit v1.2.3