From: Matt Roper Date: Tue, 19 Sep 2023 19:21:14 +0000 (-0700) Subject: drm/i915/xe2lpd: Don't try to program PLANE_AUX_DIST X-Git-Tag: io_uring-6.7-2023-11-10~63^2~15^2~46 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8ee35345adf13cea516a36c70b9ba997106cd11a;p=linux-block.git drm/i915/xe2lpd: Don't try to program PLANE_AUX_DIST 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 Signed-off-by: Lucas De Marchi Reviewed-by: Anusha Srivatsa Link: https://patchwork.freedesktop.org/patch/msgid/20230919192128.2045154-8-lucas.demarchi@intel.com --- diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index b0a49659202a..b1f9adae190d 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -1246,7 +1246,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));