]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
delete drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch-32435 from 6.1...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Dec 2023 02:44:12 +0000 (11:44 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Dec 2023 02:44:12 +0000 (11:44 +0900)
Was removed from the series file but not from the directory

queue-6.1/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch-32435 [deleted file]

diff --git a/queue-6.1/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch-32435 b/queue-6.1/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch-32435
deleted file mode 100644 (file)
index db6d1ca..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-From ad928967f1fc1951f16e2190472fb5c50401be74 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 21 Nov 2023 07:43:15 +0200
-Subject: drm/i915: Call intel_pre_plane_updates() also for pipes getting
- enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Ville Syrjälä <ville.syrjala@linux.intel.com>
-
-[ Upstream commit d21a3962d3042e6f56ad324cf18bdd64a1e6ecfa ]
-
-We used to call intel_pre_plane_updates() for any pipe going through
-a modeset whether the pipe was previously enabled or not. This in
-fact needed to apply all the necessary clock gating workarounds/etc.
-Restore the correct behaviour.
-
-Fixes: 39919997322f ("drm/i915: Disable all planes before modesetting any pipes")
-Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20231121054324.9988-3-ville.syrjala@linux.intel.com
-(cherry picked from commit e0d5ce11ed0a21bb2bf328ad82fd261783c7ad88)
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/i915/display/intel_display.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
-index 96e679a176e94..1977f4c6fd889 100644
---- a/drivers/gpu/drm/i915/display/intel_display.c
-+++ b/drivers/gpu/drm/i915/display/intel_display.c
-@@ -7188,10 +7188,11 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
-               if (!intel_crtc_needs_modeset(new_crtc_state))
-                       continue;
-+              intel_pre_plane_update(state, crtc);
-+
-               if (!old_crtc_state->hw.active)
-                       continue;
--              intel_pre_plane_update(state, crtc);
-               intel_crtc_disable_planes(state, crtc);
-       }
--- 
-2.42.0
-