drm/i915: Pimp encoder ddc_pin/aux_ch debug messages

Use encoder->name rather than port_name() in the debug messages
so that they actually make more sense.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230216231312.32664-2-ville.syrjala@linux.intel.com
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c
index c4e72c17e06ad778e3aec6e64d75d313f6215764..57eb3ff187fa9cbe19f0ff27111cd4065f49b144 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_aux.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c
@@ -747,16 +747,18 @@ enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder)
 
        aux_ch = intel_bios_dp_aux_ch(encoder->devdata);
        if (aux_ch != AUX_CH_NONE) {
-               drm_dbg_kms(&i915->drm, "using AUX %c for port %c (VBT)\n",
-                           aux_ch_name(aux_ch), port_name(port));
+               drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] using AUX %c (VBT)\n",
+                           encoder->base.base.id, encoder->base.name,
+                           aux_ch_name(aux_ch));
                return aux_ch;
        }
 
        aux_ch = (enum aux_ch)port;
 
        drm_dbg_kms(&i915->drm,
-                   "using AUX %c for port %c (platform default)\n",
-                   aux_ch_name(aux_ch), port_name(port));
+                   "[ENCODER:%d:%s] using AUX %c (platform default)\n",
+                   encoder->base.base.id, encoder->base.name,
+                   aux_ch_name(aux_ch));
 
        return aux_ch;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index e32452ab2647971662b70a44b49dfa74ce667971..239c0fb916f0523682b3b3a65148f4eee672e311 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2858,8 +2858,9 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder)
        ddc_pin = intel_bios_hdmi_ddc_pin(encoder->devdata);
        if (ddc_pin) {
                drm_dbg_kms(&dev_priv->drm,
-                           "Using DDC pin 0x%x for port %c (VBT)\n",
-                           ddc_pin, port_name(port));
+                           "[ENCODER:%d:%s] Using DDC pin 0x%x (VBT)\n",
+                           encoder->base.base.id, encoder->base.name,
+                           ddc_pin);
                return ddc_pin;
        }
 
@@ -2885,8 +2886,9 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder)
                ddc_pin = g4x_port_to_ddc_pin(dev_priv, port);
 
        drm_dbg_kms(&dev_priv->drm,
-                   "Using DDC pin 0x%x for port %c (platform default)\n",
-                   ddc_pin, port_name(port));
+                   "[ENCODER:%d:%s] Using DDC pin 0x%x (platform default)\n",
+                   encoder->base.base.id, encoder->base.name,
+                   ddc_pin);
 
        return ddc_pin;
 }