drm/i915/dram: Use intel_dram_type_str() for pnv

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>
Link: https://patchwork.freedesktop.org/patch/msgid/20250902133113.18778-3-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i915/display/i9xx_wm.c
index 060aff7659946e13d1c73713e69f750e29ff5058..fd3b7b35f351a42273820f3b5305dab656d8b51f 100644 (file)
--- a/drivers/gpu/drm/i915/display/i9xx_wm.c
+++ b/drivers/gpu/drm/i915/display/i9xx_wm.c
@@ -105,8 +105,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 7d8b8f81e215e62ef154b03a8844cde2d7639b8b..b4f0793f778dc171970eadaf0e2975f4d61e3c18 100644 (file)
--- 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 7e3b3d961fcbec06f9c674048dfd509d03726953..846a77b1aa903c6075cb2d87ec5b22c3fb318f57 100644 (file)
--- 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__ */