summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2022-04-11 04:06:33 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2022-04-11 04:06:33 +0000
commit2706690be925216471f65aa7b260dd1833eeaade (patch)
tree65cfe9ce44d8fcfd8882a28921fe324044bf6dd4 /sys
parentbd4f90d68098152a1d2b42ff9b8537b985f93dba (diff)
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
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/i915/display/intel_bw.c3
1 files changed, 2 insertions, 1 deletions
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);
}