From: Sasha Levin Date: Mon, 4 Dec 2023 19:42:10 +0000 (-0500) Subject: Drop drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch X-Git-Tag: v4.14.332~23^2~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6313b24b7b2cad164f64901ec3592c5e8d97c57c;p=thirdparty%2Fkernel%2Fstable-queue.git Drop drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch b/queue-6.1/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch deleted file mode 100644 index d20fac35c78..00000000000 --- a/queue-6.1/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch +++ /dev/null @@ -1,49 +0,0 @@ -From de261af876a201343f3a6185a57aeb5321ba79d0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -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ä - -[ 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 -Signed-off-by: Ville Syrjälä -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 -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-6.1/series b/queue-6.1/series index cb033624bc7..7aa741746af 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -91,7 +91,6 @@ iommu-vt-d-allocate-pasid-table-in-device-probe-path.patch iommu-vt-d-add-device_block_translation-helper.patch iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch -drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch-19858 fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 @@ -105,7 +104,6 @@ iommu-vt-d-allocate-pasid-table-in-device-probe-path.patch-8635 iommu-vt-d-add-device_block_translation-helper.patch-1231 iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch-15652 iommu-vt-d-make-context-clearing-consistent-with-con.patch-12070 -drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch-32435 drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch-16085 mmc-core-add-helpers-mmc_regulator_enable-disable_vq.patch mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the.patch diff --git a/queue-6.6/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch b/queue-6.6/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch deleted file mode 100644 index f6e7d1d2f91..00000000000 --- a/queue-6.6/drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 96b8700b91f6931409b5979c15d478756f645152 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -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ä - -[ 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 -Signed-off-by: Ville Syrjälä -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 -Signed-off-by: Sasha Levin ---- - 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 763ab569d8f32..8232887fdf948 100644 ---- a/drivers/gpu/drm/i915/display/intel_display.c -+++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -6658,10 +6658,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 - diff --git a/queue-6.6/series b/queue-6.6/series index 1c7e565ceab..182c53b9c4a 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -117,7 +117,6 @@ iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch drm-i915-gsc-mark-internal-gsc-engine-with-reserved-.patch -drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch drm-panel-starry-2081101qfh032011-53g-fine-tune-the-.patch drm-panel-nt36523-fix-return-value-check-in-nt36523_.patch cpufreq-amd-pstate-fix-scaling_min_freq-and-scaling_.patch