summaryrefslogtreecommitdiff
path: root/SOURCES/0001-Revert-b0cb56fc6e3096c9da04c30d9b501da84dae2b4f.patch
diff options
context:
space:
mode:
Diffstat (limited to 'SOURCES/0001-Revert-b0cb56fc6e3096c9da04c30d9b501da84dae2b4f.patch')
-rw-r--r--SOURCES/0001-Revert-b0cb56fc6e3096c9da04c30d9b501da84dae2b4f.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/SOURCES/0001-Revert-b0cb56fc6e3096c9da04c30d9b501da84dae2b4f.patch b/SOURCES/0001-Revert-b0cb56fc6e3096c9da04c30d9b501da84dae2b4f.patch
new file mode 100644
index 0000000..e9aa9df
--- /dev/null
+++ b/SOURCES/0001-Revert-b0cb56fc6e3096c9da04c30d9b501da84dae2b4f.patch
@@ -0,0 +1,40 @@
+From 176f7c35f0ce2cbac1f59ce1057bc953d5841f4b Mon Sep 17 00:00:00 2001
+From: GloriousEggroll <gloriouseggroll@gmail.com>
+Date: Wed, 5 Jul 2023 15:09:57 -0600
+Subject: [PATCH 1/3] Revert b0cb56fc6e3096c9da04c30d9b501da84dae2b4f
+
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 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 2cbd69498..51a3130f6 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -8213,12 +8213,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ if (acrtc_state->abm_level != dm_old_crtc_state->abm_level)
+ bundle->stream_update.abm_level = &acrtc_state->abm_level;
+
+- mutex_lock(&dm->dc_lock);
+- if ((acrtc_state->update_type > UPDATE_TYPE_FAST) &&
+- acrtc_state->stream->link->psr_settings.psr_allow_active)
+- amdgpu_dm_psr_disable(acrtc_state->stream);
+- mutex_unlock(&dm->dc_lock);
+-
+ /*
+ * If FreeSync state on the stream has changed then we need to
+ * re-adjust the min/max bounds now that DC doesn't handle this
+@@ -8232,6 +8226,10 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ spin_unlock_irqrestore(&pcrtc->dev->event_lock, flags);
+ }
+ mutex_lock(&dm->dc_lock);
++ if ((acrtc_state->update_type > UPDATE_TYPE_FAST) &&
++ acrtc_state->stream->link->psr_settings.psr_allow_active)
++ amdgpu_dm_psr_disable(acrtc_state->stream);
++
+ update_planes_and_stream_adapter(dm->dc,
+ acrtc_state->update_type,
+ planes_count,
+--
+2.41.0
+