diff options
author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2015-03-03 08:21:57 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-17 17:29:54 -0400 |
commit | 10634189fc50d30c7269e3e1af167608f7aebcfc (patch) | |
tree | b6368083f9141c4cbcc67d3ac4084cc4759e49ab /drivers/gpu/drm/i915/intel_display.c | |
parent | 3a3371ff0d924270fde978c93eb3921ad544eb79 (diff) |
drm/i915: Improve staged config logging
When logging that full mode switch is necessary, log which connector,
encoder or crtc has caused it, so it is easier to figure out what is
goind on by just looking at the log.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c63adef3e91c..8e9e18ccfcd8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -11504,7 +11504,9 @@ intel_modeset_stage_output_state(struct drm_device *dev, | |||
11504 | 11504 | ||
11505 | 11505 | ||
11506 | if (&connector->new_encoder->base != connector->base.encoder) { | 11506 | if (&connector->new_encoder->base != connector->base.encoder) { |
11507 | DRM_DEBUG_KMS("encoder changed, full mode switch\n"); | 11507 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] encoder changed, full mode switch\n", |
11508 | connector->base.base.id, | ||
11509 | connector->base.name); | ||
11508 | config->mode_changed = true; | 11510 | config->mode_changed = true; |
11509 | } | 11511 | } |
11510 | } | 11512 | } |
@@ -11555,7 +11557,9 @@ intel_modeset_stage_output_state(struct drm_device *dev, | |||
11555 | /* Only now check for crtc changes so we don't miss encoders | 11557 | /* Only now check for crtc changes so we don't miss encoders |
11556 | * that will be disabled. */ | 11558 | * that will be disabled. */ |
11557 | if (&encoder->new_crtc->base != encoder->base.crtc) { | 11559 | if (&encoder->new_crtc->base != encoder->base.crtc) { |
11558 | DRM_DEBUG_KMS("crtc changed, full mode switch\n"); | 11560 | DRM_DEBUG_KMS("[ENCODER:%d:%s] crtc changed, full mode switch\n", |
11561 | encoder->base.base.id, | ||
11562 | encoder->base.name); | ||
11559 | config->mode_changed = true; | 11563 | config->mode_changed = true; |
11560 | } | 11564 | } |
11561 | } | 11565 | } |
@@ -11576,7 +11580,8 @@ intel_modeset_stage_output_state(struct drm_device *dev, | |||
11576 | } | 11580 | } |
11577 | 11581 | ||
11578 | if (crtc->new_enabled != crtc->base.state->enable) { | 11582 | if (crtc->new_enabled != crtc->base.state->enable) { |
11579 | DRM_DEBUG_KMS("crtc %sabled, full mode switch\n", | 11583 | DRM_DEBUG_KMS("[CRTC:%d] %sabled, full mode switch\n", |
11584 | crtc->base.base.id, | ||
11580 | crtc->new_enabled ? "en" : "dis"); | 11585 | crtc->new_enabled ? "en" : "dis"); |
11581 | config->mode_changed = true; | 11586 | config->mode_changed = true; |
11582 | } | 11587 | } |