Re: [PATCH 2/8] drm/i915/dram: Use intel_dram_type_str() for pnv

[Jani Nikula <jani.nikula@linux.intel.com>]

On Tue, 02 Sep 2025, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Replace the hand rolled PNV memory type printk string
> stuff with intel_dram_type_str().
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/i9xx_wm.c | 5 +++--
>  drivers/gpu/drm/i915/soc/intel_dram.c  | 2 +-
>  drivers/gpu/drm/i915/soc/intel_dram.h  | 1 +
>  3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i915/display/i9xx_wm.c
> index 591acce2a4b1..b7f3c7a3aff5 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_wm.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_wm.c
> @@ -103,8 +103,9 @@ static const struct cxsr_latency *pnv_get_cxsr_latency(struct intel_display *dis
>  	}
>  
>  	drm_dbg_kms(display->drm,
> -		    "Could not find CxSR latency for DDR%s, FSB %u kHz, MEM %u kHz\n",
> -		    is_ddr3 ? "3" : "2", dram_info->fsb_freq, dram_info->mem_freq);
> +		    "Could not find CxSR latency for %s, FSB %u kHz, MEM %u kHz\n",
> +		    intel_dram_type_str(dram_info->type),
> +		    dram_info->fsb_freq, dram_info->mem_freq);
>  
>  	return NULL;
>  }
> diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
> index 7d8b8f81e215..b4f0793f778d 100644
> --- a/drivers/gpu/drm/i915/soc/intel_dram.c
> +++ b/drivers/gpu/drm/i915/soc/intel_dram.c
> @@ -31,7 +31,7 @@ struct dram_channel_info {
>  
>  #define DRAM_TYPE_STR(type) [INTEL_DRAM_ ## type] = #type
>  
> -static const char *intel_dram_type_str(enum intel_dram_type type)
> +const char *intel_dram_type_str(enum intel_dram_type type)
>  {
>  	static const char * const str[] = {
>  		DRAM_TYPE_STR(UNKNOWN),
> diff --git a/drivers/gpu/drm/i915/soc/intel_dram.h b/drivers/gpu/drm/i915/soc/intel_dram.h
> index 7e3b3d961fcb..846a77b1aa90 100644
> --- a/drivers/gpu/drm/i915/soc/intel_dram.h
> +++ b/drivers/gpu/drm/i915/soc/intel_dram.h
> @@ -39,5 +39,6 @@ int intel_dram_detect(struct drm_i915_private *i915);
>  unsigned int intel_fsb_freq(struct drm_i915_private *i915);
>  unsigned int intel_mem_freq(struct drm_i915_private *i915);
>  const struct dram_info *intel_dram_info(struct drm_device *drm);
> +const char *intel_dram_type_str(enum intel_dram_type type);
>  
>  #endif /* __INTEL_DRAM_H__ */

-- 
Jani Nikula, Intel