drm/xe: Cleanup has_flat_ccs handling

The flag is set in XE_HP_FEATURES, but then overridden in all but one
xe_graphics_desc. Make it set only where needed.

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240904162238.2831202-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 942817e5a79e6991dfa98c75284edefc0b9abeae..add735369f8fd48c52ff7f76bf8cec07fd66b0c1 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -103,7 +103,6 @@ static const struct xe_graphics_desc graphics_xelpp = {
 
 #define XE_HP_FEATURES \
        .has_range_tlb_invalidation = true, \
-       .has_flat_ccs = true, \
        .dma_mask_size = 46, \
        .va_bits = 48, \
        .vm_max_level = 3
@@ -120,6 +119,8 @@ static const struct xe_graphics_desc graphics_xehpg = {
 
        XE_HP_FEATURES,
        .vram_flags = XE_VRAM_FLAGS_NEED64K,
+
+       .has_flat_ccs = 1,
 };
 
 static const struct xe_graphics_desc graphics_xehpc = {
@@ -145,7 +146,6 @@ static const struct xe_graphics_desc graphics_xehpc = {
 
        .has_asid = 1,
        .has_atomic_enable_pte_bit = 1,
-       .has_flat_ccs = 0,
        .has_usm = 1,
 };
 
@@ -156,7 +156,6 @@ static const struct xe_graphics_desc graphics_xelpg = {
                BIT(XE_HW_ENGINE_CCS0),
 
        XE_HP_FEATURES,
-       .has_flat_ccs = 0,
 };
 
 #define XE2_GFX_FEATURES \