From 0547c59c5996aa37c6d87667fce104b5e0d0211c Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 11 Apr 2022 04:06:32 +0000 Subject: [PATCH] drm/i915: Fix PSF GV point mask when SAGV is not possible From Ville Syrjala beeebae6ea82979d0fdeaa5e2f8ce9949ec22a24 in linux 5.15.y/5.15.33 3ef8b5e19ead5a79600ea55f9549658281415893 in mainline linux --- sys/dev/pci/drm/i915/display/intel_bw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/i915/display/intel_bw.c b/sys/dev/pci/drm/i915/display/intel_bw.c index 7144c76ac97..ea48620f76d 100644 --- a/sys/dev/pci/drm/i915/display/intel_bw.c +++ b/sys/dev/pci/drm/i915/display/intel_bw.c @@ -819,7 +819,8 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) * cause. */ if (!intel_can_enable_sagv(dev_priv, new_bw_state)) { - allowed_points = BIT(max_bw_point); + allowed_points &= ADLS_PSF_PT_MASK; + allowed_points |= BIT(max_bw_point); drm_dbg_kms(&dev_priv->drm, "No SAGV, using single QGV point %d\n", max_bw_point); } -- 2.20.1