drm/i915: Widen the QGV point mask
authorjsg <jsg@openbsd.org>
Wed, 2 Mar 2022 13:01:22 +0000 (13:01 +0000)
committerjsg <jsg@openbsd.org>
Wed, 2 Mar 2022 13:01:22 +0000 (13:01 +0000)
From Ville Syrjala
7782e3c4e5390d217604a73a095db14d48c8b714 in linux 5.15.y/5.15.26
3f33364836aacc28cd430d22cf22379e3b5ecd77 in mainline linux

sys/dev/pci/drm/i915/display/intel_bw.h

index 46c6eec..0ceaed1 100644 (file)
@@ -30,19 +30,19 @@ struct intel_bw_state {
         */
        u8 pipe_sagv_reject;
 
+       /* bitmask of active pipes */
+       u8 active_pipes;
+
        /*
         * Current QGV points mask, which restricts
         * some particular SAGV states, not to confuse
         * with pipe_sagv_mask.
         */
-       u8 qgv_points_mask;
+       u16 qgv_points_mask;
 
        unsigned int data_rate[I915_MAX_PIPES];
        u8 num_active_planes[I915_MAX_PIPES];
 
-       /* bitmask of active pipes */
-       u8 active_pipes;
-
        int min_cdclk;
 };