drm/i915: Tidy intel_dump_pipe_config a bit
Subsystems (2)
PATCH 1/1 drm/i915: Tidy intel_dump_pipe_config a bit
From: Tvrtko Ursulin <[email protected]>
A few tidies with the goal of making the output more compact and easier to read:
1. Group some data on single lines where it made sense.
2. Do not output scaler data on pre Gen9.
3. Fix plane dump so new log msg is not output in the midddle of the line and compact it a bit.
--- drivers/gpu/drm/i915/intel_display.c | 69 ++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/intel_display.c +35 -34
@@ -12131,6 +12131,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, const char *context) {struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_plane *plane;struct intel_plane *intel_plane;struct intel_plane_state *state;
@@ -12139,8 +12140,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("[CRTC:%d]%s config %p for pipe %c\n" , crtc->base.base.id, context, pipe_config,pipe_name (crtc->pipe)); -DRM_DEBUG_KMS ("cpu_transcoder: %s\n" ,transcoder_name (pipe_config->cpu_transcoder)); -DRM_DEBUG_KMS ("pipe bpp: %i, dithering: %i\n" , +DRM_DEBUG_KMS ("cpu_transcoder: %s; pipe bpp: %i, dithering: %i\n" , +transcoder_name (pipe_config->cpu_transcoder), pipe_config->pipe_bpp, pipe_config->dither); DRM_DEBUG_KMS("fdi/pch: %i, lanes: %i, gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n", pipe_config->has_pch_encoder,
@@ -12173,13 +12174,14 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("adjusted mode:\n" );drm_mode_debug_printmodeline (&pipe_config->base.adjusted_mode);intel_dump_crtc_timings (&pipe_config->base.adjusted_mode); -DRM_DEBUG_KMS ("port clock: %d\n" , pipe_config->port_clock); -DRM_DEBUG_KMS ("pipe src size: %dx%d\n" , +DRM_DEBUG_KMS ("port clock: %d; pipe src size: %dx%d\n" , + pipe_config->port_clock, 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, - pipe_config->scaler_state.scaler_users, - pipe_config->scaler_state.scaler_id); +if (INTEL_GEN (dev_priv) >=9 ) +DRM_DEBUG_KMS ("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n" , + 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", pipe_config->gmch_pfit.control, pipe_config->gmch_pfit.pgm_ratios,
@@ -12188,8 +12190,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->pch_pfit.pos, pipe_config->pch_pfit.size, pipe_config->pch_pfit.enabled ? "enabled" : "disabled"); -DRM_DEBUG_KMS ("ips: %i\n" , pipe_config->ips_enabled); -DRM_DEBUG_KMS ("double wide: %i\n" , pipe_config->double_wide); +DRM_DEBUG_KMS ("ips: %i; double wide: %i\n" , + pipe_config->ips_enabled, pipe_config->double_wide);if (IS_BROXTON (dev)) { DRM_DEBUG_KMS("ddi_pll_sel: %u; dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x,"
@@ -12228,38 +12230,37 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->dpll_hw_state.fp1); } -DRM_DEBUG_KMS ("planes on this crtc\n" ); +DRM_DEBUG_KMS ("Planes on this crtc:\n" );list_for_each_entry (plane, &dev->mode_config.plane_list, head) { intel_plane =to_intel_plane (plane);if (intel_plane->pipe != crtc->pipe)continue ; +DRM_DEBUG_KMS (" %s plane:%d (%u.%u) idx: %d\n" , + plane->type ==DRM_PLANE_TYPE_CURSOR ? +"cursor" :"standard" , + plane->base.id, intel_plane->pipe, + (crtc->base.primary == plane) ? +0 : intel_plane->plane +1 , +drm_plane_index (plane)); + state =to_intel_plane_state (plane->state); fb = state->base.fb; -if (!fb) { -DRM_DEBUG_KMS ("%s PLANE:%d plane: %u.%u idx: %d " -"disabled, scaler_id = %d\n" , - plane->type ==DRM_PLANE_TYPE_CURSOR ?"CURSOR" :"STANDARD" , - plane->base.id, intel_plane->pipe, - (crtc->base.primary == plane) ?0 : intel_plane->plane +1 , -drm_plane_index (plane), state->scaler_id); -continue ; - } -DRM_DEBUG_KMS ("%s PLANE:%d plane: %u.%u idx: %d enabled" , - plane->type ==DRM_PLANE_TYPE_CURSOR ?"CURSOR" :"STANDARD" , - plane->base.id, intel_plane->pipe, - crtc->base.primary == plane ?0 : intel_plane->plane +1 , -drm_plane_index (plane)); -DRM_DEBUG_KMS ("\tFB:%d, fb = %ux%u format = 0x%x" , - fb->base.id, fb->width, fb->height, fb->pixel_format); -DRM_DEBUG_KMS ("\tscaler:%d src (%u, %u) %ux%u dst (%u, %u) %ux%u\n" , - state->scaler_id, - state->src.x1 >>16 , state->src.y1 >>16 , -drm_rect_width (&state->src) >>16 , -drm_rect_height (&state->src) >>16 , - state->dst.x1, state->dst.y1, -drm_rect_width (&state->dst),drm_rect_height (&state->dst)); +if (fb) +DRM_DEBUG_KMS ("\tfb:%d, %ux%u, format = 0x%x" , + fb->base.id, fb->width, fb->height, + fb->pixel_format); + +if (fb &&INTEL_GEN (dev_priv) >=9 ) +DRM_DEBUG_KMS ("\tscaler:%d src (%u, %u) %ux%u dst (%u, %u) %ux%u\n" , + state->scaler_id, + state->src.x1 >>16 , state->src.y1 >>16 , +drm_rect_width (&state->src) >>16 , +drm_rect_height (&state->src) >>16 , + state->dst.x1, state->dst.y1, +drm_rect_width (&state->dst), +drm_rect_height (&state->dst)); } }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Tidy intel_dump_pipe_config a bit
== Series Details ==
== Series Details ==
Series: drm/i915: Tidy intel_dump_pipe_config a bit
URL : https://patchwork.freedesktop.org/series/6457/
State : failure
== Summary ==
Series 6457v1 drm/i915: Tidy intel_dump_pipe_config a bit
http://patchwork.freedesktop.org/api/1.0/series/6457/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> INCOMPLETE (snb-dellxps)
Test kms_force_connector_basic:
Subgroup force-connector-state:
skip -> PASS (ivb-t430s)bsw-nuc-2 total:200 pass:159 dwarn:0 dfail:0 fail:0 skip:41 byt-nuc total:200 pass:159 dwarn:0 dfail:0 fail:0 skip:41 hsw-brixbox total:201 pass:175 dwarn:0 dfail:0 fail:0 skip:26 hsw-gt2 total:201 pass:179 dwarn:0 dfail:0 fail:1 skip:21 ilk-hp8440p total:201 pass:140 dwarn:0 dfail:0 fail:0 skip:61 ivb-t430s total:201 pass:170 dwarn:0 dfail:0 fail:0 skip:31 skl-i7k-2 total:201 pass:174 dwarn:0 dfail:0 fail:0 skip:27 skl-nuci5 total:201 pass:190 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:1 pass:0 dwarn:0 dfail:0 fail:0 skip:0 snb-x220t total:201 pass:159 dwarn:0 dfail:0 fail:1 skip:41
Results at /archive/results/CI_IGT_test/Patchwork_2100/
ea90e07fd4b912749e230f4960ddd8ec6cb3d268 drm-intel-nightly: 2016y-04m-28d-09h-51m-12s UTC integration manifest 4682677 drm/i915: Tidy intel_dump_pipe_config a bit
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx