From c61e4ba88e53a26e599a8e83d1f0fd6cb4c31a33 Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 18 Apr 2024 00:54:36 +0000 Subject: [PATCH] drm/i915/vrr: Disable VRR when using bigjoiner From Ville Syrjala f9b31dfdc0b5a04fb78cde6d2c64e54607dd316d in linux-6.6.y/6.6.28 dcd8992e47f13afb5c11a61e8d9c141c35e23751 in mainline linux --- sys/dev/pci/drm/i915/display/intel_vrr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/pci/drm/i915/display/intel_vrr.c b/sys/dev/pci/drm/i915/display/intel_vrr.c index 88e4759b538..b844bdd16de 100644 --- a/sys/dev/pci/drm/i915/display/intel_vrr.c +++ b/sys/dev/pci/drm/i915/display/intel_vrr.c @@ -111,6 +111,13 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state, 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; -- 2.20.1