| From 404a76c54fbaf2ef4478a8aa880b8133f39fdf14 Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Thu, 11 Apr 2013 19:49:07 +0200 |
| Subject: drm/i915: move debug output back to the right place |
| |
| When adding the pipe config computation step I've accidentally moved |
| this a bit away. Which momentarily confused me since the pipe config |
| step rejected some modesetting operations I expected and so left me |
| looking in vain for that debug output. |
| |
| v2: Move the debug output into the right function to prevent this from |
| happening again. |
| |
| v3: Make it compile (Ville). Also reorder the patch so that the two |
| bugfixes are first. |
| |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit e3641d3f77bb9aea8442dc25018d651d3a348d76) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index 4575e6ebfb07..45ae32757212 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -7760,6 +7760,9 @@ intel_modeset_affected_pipes(struct drm_crtc *crtc, unsigned *modeset_pipes, |
| */ |
| *modeset_pipes &= 1 << intel_crtc->pipe; |
| *prepare_pipes &= 1 << intel_crtc->pipe; |
| + |
| + DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n", |
| + *modeset_pipes, *prepare_pipes, *disable_pipes); |
| } |
| |
| static bool intel_crtc_in_use(struct drm_crtc *crtc) |
| @@ -7995,9 +7998,6 @@ static int __intel_set_mode(struct drm_crtc *crtc, |
| } |
| } |
| |
| - DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n", |
| - modeset_pipes, prepare_pipes, disable_pipes); |
| - |
| for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc) |
| intel_crtc_disable(&intel_crtc->base); |
| |
| -- |
| 1.8.5.rc3 |
| |
