| Message ID | 20250324-dram-type-v1-2-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:42PM -0700, Lucas De Marchi wrote: > Instead of logging the dram type in the per version/platform function, > do it in the generic one. This fixes a few discrepancies depending on > the platform: > > - There was no DRAM type logging for graphics version 12 and > above > - For graphics version 11, it would log the DRAM type in > skl_get_dram_info(), but could possibly override it later > without any log in icl_pcode_read_mem_global_info() > > For bxt_get_dram_info(), there's no need to log the type for each dimm, > as the drm_WARN_ON() already covers the case the are not all the same. > > This maintains the behavior of skl_get_dram_info() that would log the > DRAM type even on failures. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/soc/intel_dram.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c > index 39d8520ee621d..eee5c4f45a43c 100644 > --- a/drivers/gpu/drm/i915/soc/intel_dram.c > +++ b/drivers/gpu/drm/i915/soc/intel_dram.c > @@ -450,8 +450,6 @@ skl_get_dram_info(struct drm_i915_private *i915) > int ret; > > dram_info->type = skl_get_dram_type(i915); > - drm_dbg_kms(&i915->drm, "DRAM type: %s\n", > - intel_dram_type_str(dram_info->type)); > > ret = skl_dram_get_channels_info(i915); > if (ret) > @@ -566,10 +564,9 @@ static int bxt_get_dram_info(struct drm_i915_private *i915) > dram_info->type != type); > > drm_dbg_kms(&i915->drm, > - "CH%u DIMM size: %u Gb, width: X%u, ranks: %u, type: %s\n", > + "CH%u DIMM size: %u Gb, width: X%u, ranks: %u\n", > i - BXT_D_CR_DRP0_DUNIT_START, > - dimm.size, dimm.width, dimm.ranks, > - intel_dram_type_str(type)); > + dimm.size, dimm.width, dimm.ranks); > > if (valid_ranks == 0) > valid_ranks = dimm.ranks; > @@ -736,6 +733,10 @@ void intel_dram_detect(struct drm_i915_private *i915) > ret = bxt_get_dram_info(i915); > else > ret = skl_get_dram_info(i915); > + > + drm_dbg_kms(&i915->drm, "DRAM type: %s\n", > + intel_dram_type_str(dram_info->type)); > + > if (ret) > return; > > > -- > 2.49.0 >
diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c index 39d8520ee621d..eee5c4f45a43c 100644 --- a/drivers/gpu/drm/i915/soc/intel_dram.c +++ b/drivers/gpu/drm/i915/soc/intel_dram.c @@ -450,8 +450,6 @@ skl_get_dram_info(struct drm_i915_private *i915) int ret; dram_info->type = skl_get_dram_type(i915); - drm_dbg_kms(&i915->drm, "DRAM type: %s\n", - intel_dram_type_str(dram_info->type)); ret = skl_dram_get_channels_info(i915); if (ret) @@ -566,10 +564,9 @@ static int bxt_get_dram_info(struct drm_i915_private *i915) dram_info->type != type); drm_dbg_kms(&i915->drm, - "CH%u DIMM size: %u Gb, width: X%u, ranks: %u, type: %s\n", + "CH%u DIMM size: %u Gb, width: X%u, ranks: %u\n", i - BXT_D_CR_DRP0_DUNIT_START, - dimm.size, dimm.width, dimm.ranks, - intel_dram_type_str(type)); + dimm.size, dimm.width, dimm.ranks); if (valid_ranks == 0) valid_ranks = dimm.ranks; @@ -736,6 +733,10 @@ void intel_dram_detect(struct drm_i915_private *i915) ret = bxt_get_dram_info(i915); else ret = skl_get_dram_info(i915); + + drm_dbg_kms(&i915->drm, "DRAM type: %s\n", + intel_dram_type_str(dram_info->type)); + if (ret) return;
Instead of logging the dram type in the per version/platform function, do it in the generic one. This fixes a few discrepancies depending on the platform: - There was no DRAM type logging for graphics version 12 and above - For graphics version 11, it would log the DRAM type in skl_get_dram_info(), but could possibly override it later without any log in icl_pcode_read_mem_global_info() For bxt_get_dram_info(), there's no need to log the type for each dimm, as the drm_WARN_ON() already covers the case the are not all the same. This maintains the behavior of skl_get_dram_info() that would log the DRAM type even on failures. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/soc/intel_dram.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)