aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-08-07 06:01:31 -0400
committerEric Anholt <eric@anholt.net>2010-08-09 14:24:34 -0400
commit868dc58fbfda73493d62eae353b6b13649550e10 (patch)
treece93f40083c5a1b570baa36f8e51db9cfd38c2ac
parentae9fed6b601821d70928797c56da0e2008ef840d (diff)
drm/i915/display: Add pipe/plane information to dpms debugging
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 874ae30d5e4a..07f19967687b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1956,7 +1956,7 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
1956 case DRM_MODE_DPMS_ON: 1956 case DRM_MODE_DPMS_ON:
1957 case DRM_MODE_DPMS_STANDBY: 1957 case DRM_MODE_DPMS_STANDBY:
1958 case DRM_MODE_DPMS_SUSPEND: 1958 case DRM_MODE_DPMS_SUSPEND:
1959 DRM_DEBUG_KMS("crtc %d dpms on\n", pipe); 1959 DRM_DEBUG_KMS("crtc %d/%d dpms on\n", pipe, plane);
1960 1960
1961 if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) { 1961 if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
1962 temp = I915_READ(PCH_LVDS); 1962 temp = I915_READ(PCH_LVDS);
@@ -2142,10 +2142,10 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
2142 intel_crtc_load_lut(crtc); 2142 intel_crtc_load_lut(crtc);
2143 2143
2144 intel_update_fbc(crtc, &crtc->mode); 2144 intel_update_fbc(crtc, &crtc->mode);
2145 break;
2145 2146
2146 break;
2147 case DRM_MODE_DPMS_OFF: 2147 case DRM_MODE_DPMS_OFF:
2148 DRM_DEBUG_KMS("crtc %d dpms off\n", pipe); 2148 DRM_DEBUG_KMS("crtc %d/%d dpms off\n", pipe, plane);
2149 2149
2150 drm_vblank_off(dev, pipe); 2150 drm_vblank_off(dev, pipe);
2151 /* Disable display plane */ 2151 /* Disable display plane */