drm/i915/dram: Add missing INTEL_DRAM str conversions

Some new dram types were added without adding the corresponding string
conversion, probably because it's not being used by recent platforms.
Add them, together with a BUILD_BUG_ON() to ensure it keeps in sync, in
preparation to make use of them in recent platforms.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20250324-dram-type-v1-1-bf60ef33ac01@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 54538b6f85df5a3616ac64e6d53c0d82c417684a..236c48d282e4741e2934862fc16a87d4a6b3f83e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -306,6 +306,7 @@ struct drm_i915_private {
                        INTEL_DRAM_LPDDR5,
                        INTEL_DRAM_GDDR,
                        INTEL_DRAM_GDDR_ECC,
+                       __INTEL_DRAM_TYPE_MAX,
                } type;
                u8 num_qgv_points;
                u8 num_psf_gv_points;

diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
index f60eedb0e92cfe468336c6a95c33299f5490a11d..39d8520ee621d41cd4bb2beb7fa63b0a8e3bce43 100644 (file)
--- a/drivers/gpu/drm/i915/soc/intel_dram.c
+++ b/drivers/gpu/drm/i915/soc/intel_dram.c
@@ -33,8 +33,14 @@ static const char *intel_dram_type_str(enum intel_dram_type type)
                DRAM_TYPE_STR(DDR4),
                DRAM_TYPE_STR(LPDDR3),
                DRAM_TYPE_STR(LPDDR4),
+               DRAM_TYPE_STR(DDR5),
+               DRAM_TYPE_STR(LPDDR5),
+               DRAM_TYPE_STR(GDDR),
+               DRAM_TYPE_STR(GDDR_ECC),
        };
 
+       BUILD_BUG_ON(ARRAY_SIZE(str) != __INTEL_DRAM_TYPE_MAX);
+
        if (type >= ARRAY_SIZE(str))
                type = INTEL_DRAM_UNKNOWN;
 

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 0921e957d78432fdab8098d221044e180fba331b..50a1579bb18e0086c27f08557f8be890cb0ed706 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -576,6 +576,7 @@ struct xe_device {
                        INTEL_DRAM_LPDDR5,
                        INTEL_DRAM_GDDR,
                        INTEL_DRAM_GDDR_ECC,
+                       __INTEL_DRAM_TYPE_MAX,
                } type;
                u8 num_qgv_points;
                u8 num_psf_gv_points;