diff --git a/patches.suse/drm-i915-Disable-port-sync-when-bigjoiner-is-used.patch b/patches.suse/drm-i915-Disable-port-sync-when-bigjoiner-is-used.patch new file mode 100644 index 0000000..f228892 --- /dev/null +++ b/patches.suse/drm-i915-Disable-port-sync-when-bigjoiner-is-used.patch @@ -0,0 +1,52 @@ +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: [PATCH] drm/i915: Disable port sync when bigjoiner is used +Mime-version: 1.0 +Content-type: text/plain; charset=UTF-8 +Content-transfer-encoding: 8bit +Git-commit: 0653d501409eeb9f1deb7e4c12e4d0d2c9f1cba1 +Patch-mainline: v6.9-rc4 +Alt-commit: b37e1347b991459c38c56ec2476087854a4f720b +References: stable-fixes + +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 +Acked-by: Takashi Iwai + +--- + drivers/gpu/drm/i915/display/intel_ddi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c +index c587a8efeafc..c17462b4c2ac 100644 +--- a/drivers/gpu/drm/i915/display/intel_ddi.c ++++ b/drivers/gpu/drm/i915/display/intel_ddi.c +@@ -4256,7 +4256,12 @@ static bool m_n_equal(const struct intel_link_m_n *m_n_1, + 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 && +-- +2.43.0 + diff --git a/series.conf b/series.conf index d7a50e2..a876473 100644 --- a/series.conf +++ b/series.conf @@ -20656,6 +20656,7 @@ patches.suse/Bluetooth-l2cap-Don-t-double-set-the-HCI_CONN_MGMT_C.patch patches.suse/ACPI-scan-Do-not-increase-dep_unmet-for-already-met-.patch patches.suse/drm-i915-cdclk-Fix-CDCLK-programming-order-when-pipe.patch + patches.suse/drm-i915-Disable-port-sync-when-bigjoiner-is-used.patch patches.suse/accel-ivpu-Fix-deadlock-in-context_xa.patch patches.suse/amdkfd-use-calloc-instead-of-kzalloc-to-avoid-intege.patch patches.suse/iommu-vt-d-Fix-wrong-use-of-pasid-config.patch