Commit dd2f616d authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Only dump scaler config where supported

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 2c89429e
...@@ -12767,10 +12767,12 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, ...@@ -12767,10 +12767,12 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n", DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n",
pipe_config->port_clock, pipe_config->port_clock,
pipe_config->pipe_src_w, pipe_config->pipe_src_h); pipe_config->pipe_src_w, pipe_config->pipe_src_h);
DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
crtc->num_scalers, if (INTEL_GEN(dev_priv) >= 9)
pipe_config->scaler_state.scaler_users, DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
pipe_config->scaler_state.scaler_id); crtc->num_scalers,
pipe_config->scaler_state.scaler_users,
pipe_config->scaler_state.scaler_id);
DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n", DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n",
pipe_config->gmch_pfit.control, pipe_config->gmch_pfit.control,
pipe_config->gmch_pfit.pgm_ratios, pipe_config->gmch_pfit.pgm_ratios,
...@@ -12831,20 +12833,20 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, ...@@ -12831,20 +12833,20 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
continue; continue;
} }
DRM_DEBUG_KMS("[PLANE:%d:%s] enabled", DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d, fb = %ux%u format = %s\n",
plane->base.id, plane->name); plane->base.id, plane->name,
DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = %s",
fb->base.id, fb->width, fb->height, fb->base.id, fb->width, fb->height,
drm_get_format_name(fb->pixel_format, &format_name)); drm_get_format_name(fb->pixel_format, &format_name));
DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n", if (INTEL_GEN(dev_priv) >= 9)
state->scaler_id, DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n",
state->base.src.x1 >> 16, state->scaler_id,
state->base.src.y1 >> 16, state->base.src.x1 >> 16,
drm_rect_width(&state->base.src) >> 16, state->base.src.y1 >> 16,
drm_rect_height(&state->base.src) >> 16, drm_rect_width(&state->base.src) >> 16,
state->base.dst.x1, state->base.dst.y1, drm_rect_height(&state->base.src) >> 16,
drm_rect_width(&state->base.dst), state->base.dst.x1, state->base.dst.y1,
drm_rect_height(&state->base.dst)); drm_rect_width(&state->base.dst),
drm_rect_height(&state->base.dst));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment