diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-11-17 07:30:12 -0500 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-11-17 10:00:35 -0500 |
commit | dd2f616d373388643196bab4f465a932476ef2d8 (patch) | |
tree | 3fb9e4741eedfc6c62b29bb6acc4b385004cc5e2 | |
parent | 2c89429e6bfe7c51a76953134ed34651ad37c45f (diff) |
drm/i915: Only dump scaler config where supported
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 330099a38877..81526ba36c71 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -12767,10 +12767,12 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, | |||
12767 | DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n", | 12767 | DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n", |
12768 | pipe_config->port_clock, | 12768 | pipe_config->port_clock, |
12769 | pipe_config->pipe_src_w, pipe_config->pipe_src_h); | 12769 | pipe_config->pipe_src_w, pipe_config->pipe_src_h); |
12770 | DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n", | 12770 | |
12771 | crtc->num_scalers, | 12771 | if (INTEL_GEN(dev_priv) >= 9) |
12772 | pipe_config->scaler_state.scaler_users, | 12772 | DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n", |
12773 | pipe_config->scaler_state.scaler_id); | 12773 | crtc->num_scalers, |
12774 | pipe_config->scaler_state.scaler_users, | ||
12775 | pipe_config->scaler_state.scaler_id); | ||
12774 | DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n", | 12776 | DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n", |
12775 | pipe_config->gmch_pfit.control, | 12777 | pipe_config->gmch_pfit.control, |
12776 | pipe_config->gmch_pfit.pgm_ratios, | 12778 | pipe_config->gmch_pfit.pgm_ratios, |
@@ -12831,20 +12833,20 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, | |||
12831 | continue; | 12833 | continue; |
12832 | } | 12834 | } |
12833 | 12835 | ||
12834 | DRM_DEBUG_KMS("[PLANE:%d:%s] enabled", | 12836 | DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d, fb = %ux%u format = %s\n", |
12835 | plane->base.id, plane->name); | 12837 | plane->base.id, plane->name, |
12836 | DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = %s", | ||
12837 | fb->base.id, fb->width, fb->height, | 12838 | fb->base.id, fb->width, fb->height, |
12838 | drm_get_format_name(fb->pixel_format, &format_name)); | 12839 | drm_get_format_name(fb->pixel_format, &format_name)); |
12839 | DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n", | 12840 | if (INTEL_GEN(dev_priv) >= 9) |
12840 | state->scaler_id, | 12841 | DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n", |
12841 | state->base.src.x1 >> 16, | 12842 | state->scaler_id, |
12842 | state->base.src.y1 >> 16, | 12843 | state->base.src.x1 >> 16, |
12843 | drm_rect_width(&state->base.src) >> 16, | 12844 | state->base.src.y1 >> 16, |
12844 | drm_rect_height(&state->base.src) >> 16, | 12845 | drm_rect_width(&state->base.src) >> 16, |
12845 | state->base.dst.x1, state->base.dst.y1, | 12846 | drm_rect_height(&state->base.src) >> 16, |
12846 | drm_rect_width(&state->base.dst), | 12847 | state->base.dst.x1, state->base.dst.y1, |
12847 | drm_rect_height(&state->base.dst)); | 12848 | drm_rect_width(&state->base.dst), |
12849 | drm_rect_height(&state->base.dst)); | ||
12848 | } | 12850 | } |
12849 | } | 12851 | } |
12850 | 12852 | ||