diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-15 15:46:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-15 15:46:37 +0200 |
| commit | 1612f7ce1fa3d06d0672e3f33528fef58e390910 (patch) | |
| tree | 5146cb71ebc875f7cccb7dadb37e59f0d56cca05 | |
| parent | fa0f31c930c41289ea60cd9a2a9331a6708315d5 (diff) | |
| download | stable-queue-1612f7ce1fa3d06d0672e3f33528fef58e390910.tar.gz | |
5.10-stable patches
added patches:
drm-i915-disable-port-sync-when-bigjoiner-is-used.patch
| -rw-r--r-- | queue-5.10/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch | 45 | ||||
| -rw-r--r-- | queue-5.10/series | 1 |
2 files changed, 46 insertions, 0 deletions
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 new file mode 100644 index 0000000000..508ba6ae6e --- /dev/null +++ b/queue-5.10/drm-i915-disable-port-sync-when-bigjoiner-is-used.patch @@ -0,0 +1,45 @@ +From 0653d501409eeb9f1deb7e4c12e4d0d2c9f1cba1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> +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ä <ville.syrjala@linux.intel.com> + +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 <vidya.srinivas@intel.com> +Reviewed-by: Vandita Kulkarni <vandita.kulkarni@intel.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20240404213441.17637-4-ville.syrjala@linux.intel.com +Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> +(cherry picked from commit b37e1347b991459c38c56ec2476087854a4f720b) +Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + 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 4461a112df..0ae0c45194 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -36,3 +36,4 @@ 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 |