From: Matt Roper <matthew.d.ro...@intel.com>

Since Xe2LPD technically has FlatCCS, it doesn't have AuxCCS registers
like PLANE_AUX_DIST.  However we currently have HAS_FLAT_CCS hardcoded
to 0 since compression isn't ready; we need to make sure this doesn't
cause the display code to go back to trying to write this register.

Signed-off-by: Matt Roper <matthew.d.ro...@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c 
b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 3c212d8401c8..4dfd8b627147 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1254,7 +1254,7 @@ icl_plane_update_noarm(struct intel_plane *plane,
        }
 
        /* FLAT CCS doesn't need to program AUX_DIST */
-       if (!HAS_FLAT_CCS(dev_priv))
+       if (!HAS_FLAT_CCS(dev_priv) && DISPLAY_VER(dev_priv) < 20)
                intel_de_write_fw(dev_priv, PLANE_AUX_DIST(pipe, plane_id),
                                  skl_plane_aux_dist(plane_state, color_plane));
 
-- 
2.40.1

Reply via email to