From: Greg Kroah-Hartman Date: Mon, 15 Apr 2024 13:55:24 +0000 (+0200) Subject: drop broken i915 patch from 5.10 and 5.15 X-Git-Tag: v5.15.156~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc6121b689d2729963494df03fb791027087bebf;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken i915 patch from 5.10 and 5.15 --- diff --git a/queue-5.10/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch b/queue-5.10/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch deleted file mode 100644 index 508ba6ae6e1..00000000000 --- a/queue-5.10/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0653d501409eeb9f1deb7e4c12e4d0d2c9f1cba1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= -Date: Fri, 5 Apr 2024 00:34:27 +0300 -Subject: drm/i915: Disable port sync when bigjoiner is used -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä - -commit 0653d501409eeb9f1deb7e4c12e4d0d2c9f1cba1 upstream. - -The current modeset sequence can't handle port sync and bigjoiner -at the same time. Refuse port sync when bigjoiner is needed, -at least until we fix the modeset sequence. - -v2: Add a FIXME (Vandite) - -Cc: stable@vger.kernel.org -Tested-by: Vidya Srinivas -Reviewed-by: Vandita Kulkarni -Link: https://patchwork.freedesktop.org/patch/msgid/20240404213441.17637-4-ville.syrjala@linux.intel.com -Signed-off-by: Ville Syrjälä -(cherry picked from commit b37e1347b991459c38c56ec2476087854a4f720b) -Signed-off-by: Rodrigo Vivi -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/i915/display/intel_ddi.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/gpu/drm/i915/display/intel_ddi.c -+++ b/drivers/gpu/drm/i915/display/intel_ddi.c -@@ -4564,7 +4564,12 @@ static bool m_n_equal(const struct intel - static bool crtcs_port_sync_compatible(const struct intel_crtc_state *crtc_state1, - const struct intel_crtc_state *crtc_state2) - { -+ /* -+ * FIXME the modeset sequence is currently wrong and -+ * can't deal with bigjoiner + port sync at the same time. -+ */ - return crtc_state1->hw.active && crtc_state2->hw.active && -+ !crtc_state1->bigjoiner_pipes && !crtc_state2->bigjoiner_pipes && - crtc_state1->output_types == crtc_state2->output_types && - crtc_state1->output_format == crtc_state2->output_format && - crtc_state1->lane_count == crtc_state2->lane_count && diff --git a/queue-5.10/series b/queue-5.10/series index 0ae0c451942..4461a112df1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -36,4 +36,3 @@ x86-cpu-actually-turn-off-mitigations-by-default-for-speculation_mitigations-n.p selftests-timers-fix-abs-warning-in-posix_timers-test.patch x86-apic-force-native_apic_mem_read-to-use-the-mov-instruction.patch irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch -drm-i915-disable-port-sync-when-bigjoiner-is-used.patch diff --git a/queue-5.15/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch b/queue-5.15/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch deleted file mode 100644 index a6067e784db..00000000000 --- a/queue-5.15/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0653d501409eeb9f1deb7e4c12e4d0d2c9f1cba1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= -Date: Fri, 5 Apr 2024 00:34:27 +0300 -Subject: drm/i915: Disable port sync when bigjoiner is used -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä - -commit 0653d501409eeb9f1deb7e4c12e4d0d2c9f1cba1 upstream. - -The current modeset sequence can't handle port sync and bigjoiner -at the same time. Refuse port sync when bigjoiner is needed, -at least until we fix the modeset sequence. - -v2: Add a FIXME (Vandite) - -Cc: stable@vger.kernel.org -Tested-by: Vidya Srinivas -Reviewed-by: Vandita Kulkarni -Link: https://patchwork.freedesktop.org/patch/msgid/20240404213441.17637-4-ville.syrjala@linux.intel.com -Signed-off-by: Ville Syrjälä -(cherry picked from commit b37e1347b991459c38c56ec2476087854a4f720b) -Signed-off-by: Rodrigo Vivi -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/i915/display/intel_ddi.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/gpu/drm/i915/display/intel_ddi.c -+++ b/drivers/gpu/drm/i915/display/intel_ddi.c -@@ -3904,7 +3904,12 @@ static bool m_n_equal(const struct intel - static bool crtcs_port_sync_compatible(const struct intel_crtc_state *crtc_state1, - const struct intel_crtc_state *crtc_state2) - { -+ /* -+ * FIXME the modeset sequence is currently wrong and -+ * can't deal with bigjoiner + port sync at the same time. -+ */ - return crtc_state1->hw.active && crtc_state2->hw.active && -+ !crtc_state1->bigjoiner_pipes && !crtc_state2->bigjoiner_pipes && - crtc_state1->output_types == crtc_state2->output_types && - crtc_state1->output_format == crtc_state2->output_format && - crtc_state1->lane_count == crtc_state2->lane_count && diff --git a/queue-5.15/series b/queue-5.15/series index 29fd4f4ff9f..b40ca415f85 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -43,4 +43,3 @@ x86-bugs-clarify-that-syscall-hardening-isn-t-a-bhi-mitigation.patch x86-bugs-remove-config_bhi_mitigation_auto-and-spectre_bhi-auto.patch x86-bugs-replace-config_spectre_bhi_-on-off-with-config_mitigation_spectre_bhi.patch drm-i915-cdclk-fix-cdclk-programming-order-when-pipes-are-active.patch -drm-i915-disable-port-sync-when-bigjoiner-is-used.patch