aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2014-08-11 11:37:37 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-08-11 13:32:15 -0400
commit26fbb77445bd402417f42936f68c0da26d33855d (patch)
tree599514867f8754f0166ff9506f14bfbb01cbf5a2
parente94e37ad19c74b4c2569d556cda9da4a03d4e3f8 (diff)
drm/i915: Make hpd debug messages less cryptic
Don't print raw numbers, use port_name() and tell the user whether it's long or short without having to figure out what the other magic number means. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c4
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f0d24db76e72..36eb1f234608 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1777,7 +1777,9 @@ static inline void intel_hpd_irq_handler(struct drm_device *dev,
1777 long_hpd = (dig_hotplug_reg >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT; 1777 long_hpd = (dig_hotplug_reg >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
1778 } 1778 }
1779 1779
1780 DRM_DEBUG_DRIVER("digital hpd port %d %d\n", port, long_hpd); 1780 DRM_DEBUG_DRIVER("digital hpd port %c - %s\n",
1781 port_name(port),
1782 long_hpd ? "long" : "short");
1781 /* for long HPD pulses we want to have the digital queue happen, 1783 /* for long HPD pulses we want to have the digital queue happen,
1782 but we still want HPD storm detection to function. */ 1784 but we still want HPD storm detection to function. */
1783 if (long_hpd) { 1785 if (long_hpd) {
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 3b88255d87dc..def55cdfef25 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4041,7 +4041,8 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
4041 if (intel_dig_port->base.type != INTEL_OUTPUT_EDP) 4041 if (intel_dig_port->base.type != INTEL_OUTPUT_EDP)
4042 intel_dig_port->base.type = INTEL_OUTPUT_DISPLAYPORT; 4042 intel_dig_port->base.type = INTEL_OUTPUT_DISPLAYPORT;
4043 4043
4044 DRM_DEBUG_KMS("got hpd irq on port %d - %s\n", intel_dig_port->port, 4044 DRM_DEBUG_KMS("got hpd irq on port %c - %s\n",
4045 port_name(intel_dig_port->port),
4045 long_hpd ? "long" : "short"); 4046 long_hpd ? "long" : "short");
4046 4047
4047 if (long_hpd) { 4048 if (long_hpd) {