| Message ID | 20250324-dram-type-v1-1-bf60ef33ac01@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915: DRAM type logging | expand |
On Mon, Mar 24, 2025 at 07:28:41PM -0700, Lucas De Marchi wrote: > 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. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/soc/intel_dram.c | 6 ++++++ > drivers/gpu/drm/xe/xe_device_types.h | 1 + > 3 files changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 54538b6f85df5..236c48d282e47 100644 > --- 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 f60eedb0e92cf..39d8520ee621d 100644 > --- 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 20239d6a2e985..fa9bc0b7d92e2 100644 > --- a/drivers/gpu/drm/xe/xe_device_types.h > +++ b/drivers/gpu/drm/xe/xe_device_types.h > @@ -588,6 +588,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; > > -- > 2.49.0 >
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 54538b6f85df5..236c48d282e47 100644 --- 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 f60eedb0e92cf..39d8520ee621d 100644 --- 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 20239d6a2e985..fa9bc0b7d92e2 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -588,6 +588,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;
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. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/soc/intel_dram.c | 6 ++++++ drivers/gpu/drm/xe/xe_device_types.h | 1 + 3 files changed, 8 insertions(+)