drm/i915: Try to group more logically in intel_dump_pipe_config
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/1 drm/i915: Try to group more logically in intel_dump_pipe_config
From: Tvrtko Ursulin <[email protected]>
Keep parameters relating to the pipe and crtc respectively together.
--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +7 -8
@@ -12739,9 +12739,14 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("[CRTC:%d:%s]%s\n" , crtc->base.base.id, crtc->base.name, context); -DRM_DEBUG_KMS ("cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n" , +DRM_DEBUG_KMS ("cpu_transcoder: %s, port clock: %d, ips: %i\n" ,transcoder_name (pipe_config->cpu_transcoder), - pipe_config->pipe_bpp, pipe_config->dither); + pipe_config->port_clock, pipe_config->ips_enabled); + +DRM_DEBUG_KMS ("pipe src size: %dx%d, bpp: %i, dithering: %i, double wide: %i\n" , + pipe_config->pipe_src_w, pipe_config->pipe_src_h, + pipe_config->pipe_bpp, pipe_config->dither, + pipe_config->double_wide);if (pipe_config->has_pch_encoder) intel_dump_m_n_config(pipe_config, "fdi",
@@ -12765,9 +12770,6 @@ 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, pipe src size: %dx%d\n" , - pipe_config->port_clock, - pipe_config->pipe_src_w, pipe_config->pipe_src_h);if (INTEL_GEN (dev_priv) >=9 ) DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
@@ -12786,9 +12788,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->pch_pfit.size, enableddisabled(pipe_config->pch_pfit.enabled)); -DRM_DEBUG_KMS ("ips: %i, double wide: %i\n" , - pipe_config->ips_enabled, pipe_config->double_wide); -if (IS_BROXTON (dev_priv)) {DRM_DEBUG_KMS ("dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x," "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Try to group more logically in intel_dump_pipe_config
== Series Details ==
== Series Details ==
Series: drm/i915: Try to group more logically in intel_dump_pipe_config
URL : https://patchwork.freedesktop.org/series/15547/
State : failure
== Summary ==
Series 15547v1 drm/i915: Try to group more logically in intel_dump_pipe_config
https://patchwork.freedesktop.org/api/1.0/series/15547/revisions/1/mbox/
Test gem_ringfill:
Subgroup basic-default-hang:
pass -> INCOMPLETE (fi-ivb-3520m)fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:115 pass:101 dwarn:0 dfail:0 fail:0 skip:13 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
9debbae8dd870123be84e5501dbc9c88cbe32c68 drm-intel-nightly: 2016y-11m-18d-11h-48m-38s UTC integration manifest c05b1fb drm/i915: Try to group more logically in intel_dump_pipe_config
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3052/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Keep parameters relating to the pipe and crtc respectively together.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -12739,9 +12739,14 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("[CRTC:%d:%s]%s\n" , crtc->base.base.id, crtc->base.name, context);
drivers/gpu/drm/i915/intel_display.c static void intel_dump_pipe_config(struct intel_crtc *crtc, · line 12749
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-2-DRM_DEBUG_KMS ("cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n" , +DRM_DEBUG_KMS ("cpu_transcoder: %s, port clock: %d, ips: %i\n" ,transcoder_name (pipe_config->cpu_transcoder), - pipe_config->pipe_bpp, pipe_config->dither); + pipe_config->port_clock, pipe_config->ips_enabled); + +DRM_DEBUG_KMS ("pipe src size: %dx%d, bpp: %i, dithering: %i, double wide: %i\n" , + pipe_config->pipe_src_w, pipe_config->pipe_src_h, + pipe_config->pipe_bpp, pipe_config->dither, + pipe_config->double_wide);
Better grouping yay/nay? :)
Regards,
Tvrtko
Quoted 15 lines
drivers/gpu/drm/i915/intel_display.c +0
-3if (pipe_config->has_pch_encoder) intel_dump_m_n_config(pipe_config, "fdi",@@ -12765,9 +12770,6 @@ 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, pipe src size: %dx%d\n" , - pipe_config->port_clock, - pipe_config->pipe_src_w, pipe_config->pipe_src_h);if (INTEL_GEN (dev_priv) >=9 ) DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
drivers/gpu/drm/i915/intel_display.c static void intel_dump_pipe_config(struct intel_crtc *crtc, · line 12793
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +0
-3@@ -12786,9 +12788,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->pch_pfit.size, enableddisabled(pipe_config->pch_pfit.enabled)); -DRM_DEBUG_KMS ("ips: %i, double wide: %i\n" , - pipe_config->ips_enabled, pipe_config->double_wide); -if (IS_BROXTON (dev_priv)) {DRM_DEBUG_KMS ("dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x," "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Tvrtko Ursulin
Quoted 18 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Keep parameters relating to the pipe and crtc respectively together.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -12739,9 +12739,14 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("[CRTC:%d:%s]%s\n" , crtc->base.base.id, crtc->base.name, context);
Quoted 13 lines
drivers/gpu/drm/i915/intel_display.c static void intel_dump_pipe_config(struct intel_crtc *crtc, · line 12749
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-2-DRM_DEBUG_KMS ("cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n" , +DRM_DEBUG_KMS ("cpu_transcoder: %s, port clock: %d, ips: %i\n" ,transcoder_name (pipe_config->cpu_transcoder), - pipe_config->pipe_bpp, pipe_config->dither); + pipe_config->port_clock, pipe_config->ips_enabled); + +DRM_DEBUG_KMS ("pipe src size: %dx%d, bpp: %i, dithering: %i, double wide: %i\n" , + pipe_config->pipe_src_w, pipe_config->pipe_src_h, + pipe_config->pipe_bpp, pipe_config->dither, + pipe_config->double_wide);Better grouping yay/nay? :)
Looks a lot like random shuffling.
I would suggest we just leave it as is for now. If I get sufficiently annoyed at it when looking at bugs, I might come up with something more sensible.
Quoted 29 lines
Regards,
Tvrtko
Quoted 24 lines
drivers/gpu/drm/i915/intel_display.c +0
-6if (pipe_config->has_pch_encoder) intel_dump_m_n_config(pipe_config, "fdi",@@ -12765,9 +12770,6 @@ 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, pipe src size: %dx%d\n" , - pipe_config->port_clock, - pipe_config->pipe_src_w, pipe_config->pipe_src_h);if (INTEL_GEN (dev_priv) >=9 ) DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",@@ -12786,9 +12788,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->pch_pfit.size, enableddisabled(pipe_config->pch_pfit.enabled)); -DRM_DEBUG_KMS ("ips: %i, double wide: %i\n" , - pipe_config->ips_enabled, pipe_config->double_wide); -if (IS_BROXTON (dev_priv)) {DRM_DEBUG_KMS ("dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x," "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx