diff --git a/patches.suse/drm-i915-vrr-Disable-VRR-when-using-bigjoiner.patch b/patches.suse/drm-i915-vrr-Disable-VRR-when-using-bigjoiner.patch new file mode 100644 index 0000000..42b1d72 --- /dev/null +++ b/patches.suse/drm-i915-vrr-Disable-VRR-when-using-bigjoiner.patch @@ -0,0 +1,48 @@ +From dcd8992e47f13afb5c11a61e8d9c141c35e23751 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= +Date: Fri, 5 Apr 2024 00:34:29 +0300 +Subject: [PATCH] drm/i915/vrr: Disable VRR when using bigjoiner +Mime-version: 1.0 +Content-type: text/plain; charset=UTF-8 +Content-transfer-encoding: 8bit +Git-commit: dcd8992e47f13afb5c11a61e8d9c141c35e23751 +Patch-mainline: v6.9-rc4 +Alt-commit: f9d5e51db65652dbd8a2102fd7619440e3599fd2 +References: stable-fixes + +All joined pipes share the same transcoder/timing generator. +Currently we just do the commits per-pipe, which doesn't really +work if we need to change switch between non-VRR and VRR timings +generators on the fly, or even when sending the push to the +transcoder. For now just disable VRR when bigjoiner is needed. + +Cc: stable@vger.kernel.org +Tested-by: Vidya Srinivas +Reviewed-by: Vandita Kulkarni +Link: https://patchwork.freedesktop.org/patch/msgid/20240404213441.17637-6-ville.syrjala@linux.intel.com +Signed-off-by: Ville Syrjälä +(cherry picked from commit f9d5e51db65652dbd8a2102fd7619440e3599fd2) + +Signed-off-by: Rodrigo Vivi +Acked-by: Takashi Iwai + +--- + drivers/gpu/drm/i915/display/intel_vrr.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/gpu/drm/i915/display/intel_vrr.c ++++ b/drivers/gpu/drm/i915/display/intel_vrr.c +@@ -110,6 +110,13 @@ intel_vrr_compute_config(struct intel_cr + if (!intel_vrr_is_capable(connector)) + return; + ++ /* ++ * FIXME all joined pipes share the same transcoder. ++ * Need to account for that during VRR toggle/push/etc. ++ */ ++ if (crtc_state->bigjoiner_pipes) ++ return; ++ + if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) + return; + diff --git a/series.conf b/series.conf index 633471e..00f529f 100644 --- a/series.conf +++ b/series.conf @@ -46296,6 +46296,7 @@ patches.suse/Bluetooth-hci_sock-Fix-not-validating-setsockopt-use.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/drm-i915-vrr-Disable-VRR-when-using-bigjoiner.patch patches.suse/iommu-vt-d-Allocate-local-memory-for-page-request-qu.patch # out-of-tree patches