]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/xe2lpd: Don't try to program PLANE_AUX_DIST
authorMatt Roper <matthew.d.roper@intel.com>
Tue, 19 Sep 2023 19:21:14 +0000 (12:21 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Thu, 21 Sep 2023 14:39:51 +0000 (07:39 -0700)
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.roper@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919192128.2045154-8-lucas.demarchi@intel.com
drivers/gpu/drm/i915/display/skl_universal_plane.c

index b0a49659202a1157a59e1818b51ae9d16b0ed7aa..b1f9adae190d3dc035bb99973a1fd24cbe263899 100644 (file)
@@ -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));