diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2013-10-16 07:29:54 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-16 13:42:52 -0400 |
commit | 6f2bcceb27b6120af6b76a865a72eafa50323d41 (patch) | |
tree | 4ae604446696ad8ac8111537d458f3e75d77c87f | |
parent | 45c5f2022c798b2938d4c0d1c14795787f610ccd (diff) |
drm/i915: Use pipe_name() instead of the pipe number
Yet other direct usages of the pipe number instead of pipe_name().
We've been tracking them lately but managed to miss these last ones.
v2: Catch them all! (Ville)
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1)
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_dsi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 53ad5cb9e802..d3d5adc4379d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -10762,11 +10762,11 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) | |||
10762 | } | 10762 | } |
10763 | 10763 | ||
10764 | encoder->connectors_active = false; | 10764 | encoder->connectors_active = false; |
10765 | DRM_DEBUG_KMS("[ENCODER:%d:%s] hw state readout: %s, pipe=%i\n", | 10765 | DRM_DEBUG_KMS("[ENCODER:%d:%s] hw state readout: %s, pipe %c\n", |
10766 | encoder->base.base.id, | 10766 | encoder->base.base.id, |
10767 | drm_get_encoder_name(&encoder->base), | 10767 | drm_get_encoder_name(&encoder->base), |
10768 | encoder->base.crtc ? "enabled" : "disabled", | 10768 | encoder->base.crtc ? "enabled" : "disabled", |
10769 | pipe); | 10769 | pipe_name(pipe)); |
10770 | } | 10770 | } |
10771 | 10771 | ||
10772 | list_for_each_entry(connector, &dev->mode_config.connector_list, | 10772 | list_for_each_entry(connector, &dev->mode_config.connector_list, |
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 9a2fdd2a7e34..d257b093ca68 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c | |||
@@ -350,7 +350,7 @@ static void intel_dsi_mode_set(struct intel_encoder *intel_encoder) | |||
350 | unsigned int bpp = intel_crtc->config.pipe_bpp; | 350 | unsigned int bpp = intel_crtc->config.pipe_bpp; |
351 | u32 val, tmp; | 351 | u32 val, tmp; |
352 | 352 | ||
353 | DRM_DEBUG_KMS("pipe %d\n", pipe); | 353 | DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe)); |
354 | 354 | ||
355 | /* Update the DSI PLL */ | 355 | /* Update the DSI PLL */ |
356 | vlv_enable_dsi_pll(intel_encoder); | 356 | vlv_enable_dsi_pll(intel_encoder); |
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 1f2996031ad9..de1518614827 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c | |||
@@ -574,7 +574,7 @@ void intel_panel_enable_backlight(struct drm_device *dev, | |||
574 | intel_pipe_to_cpu_transcoder(dev_priv, pipe); | 574 | intel_pipe_to_cpu_transcoder(dev_priv, pipe); |
575 | unsigned long flags; | 575 | unsigned long flags; |
576 | 576 | ||
577 | DRM_DEBUG_KMS("pipe=%d\n", pipe); | 577 | DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe)); |
578 | 578 | ||
579 | spin_lock_irqsave(&dev_priv->backlight.lock, flags); | 579 | spin_lock_irqsave(&dev_priv->backlight.lock, flags); |
580 | 580 | ||