[PATCH 07/31] drm/i915/hwconfig: Add DG2 support

[Ramalingam C]

From: Rodrigo Vivi <rodrigo.vivi at intel.com>

DG2 support for hwconfig tables varies by both SKU and stepping. DG2
also introduces a new memory type.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
Signed-off-by: John Harrison <John.C.Harrison at Intel.com>
Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
---
 drivers/gpu/drm/i915/gt/intel_hwconfig_types.h  | 1 +
 drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_hwconfig_types.h b/drivers/gpu/drm/i915/gt/intel_hwconfig_types.h
index 661373b93f3e..3994ddbf9eec 100644
--- a/drivers/gpu/drm/i915/gt/intel_hwconfig_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_hwconfig_types.h
@@ -105,6 +105,7 @@ enum {
 	INTEL_HWCONFIG_MEMORY_TYPE_LPDDR5,
 	INTEL_HWCONFIG_MEMORY_TYPE_HBM2,
 	INTEL_HWCONFIG_MEMORY_TYPE_HBM2e,
+	INTEL_HWCONFIG_MEMORY_TYPE_GDDR6,
 };
 
 #define INTEL_HWCONFIG_CACHE_TYPE_L3	BIT(0)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
index c8432fbba5f5..a5c8b79cbd66 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
@@ -137,6 +137,8 @@ static bool has_table(struct drm_i915_private *i915)
 {
 	if (IS_ADLP_GRAPHICS_STEP(i915, STEP_B0, STEP_FOREVER))
 		return 1;
+	if (IS_DG2_G11(i915) || IS_DG2_GRAPHICS_STEP(i915, G10, STEP_A2, STEP_FOREVER))
+		return 1;
 
 	return 0;
 }
-- 
2.20.1