drm/i915: Dump some DPLL fields in pipe config debug
Subsystems (2)
PATCH 1/2 drm/i915: Dump some DPLL fields in pipe config debug
From: Tvrtko Ursulin <[email protected]>
Tried to get the platform split right, please shout if I failed.
--- drivers/gpu/drm/i915/intel_display.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/gpu/drm/i915/intel_display.c +26 -0
@@ -11418,6 +11418,32 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("ips: %i\n" , pipe_config->ips_enabled);DRM_DEBUG_KMS ("double wide: %i\n" , pipe_config->double_wide); +if (IS_BROXTON (dev)) { +DRM_DEBUG_KMS ("dpll_hw_state: ebb0: 0x%x, pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, pll6: 0x%x, pll8: 0x%x, pcsdw12: 0x%x\n" , + pipe_config->dpll_hw_state.ebb0, + pipe_config->dpll_hw_state.pll0, + pipe_config->dpll_hw_state.pll1, + pipe_config->dpll_hw_state.pll2, + pipe_config->dpll_hw_state.pll3, + pipe_config->dpll_hw_state.pll6, + pipe_config->dpll_hw_state.pll8, + pipe_config->dpll_hw_state.pcsdw12); + }else if (IS_SKYLAKE (dev)) { +DRM_DEBUG_KMS ("dpll_hw_state: ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n" , + pipe_config->dpll_hw_state.ctrl1, + pipe_config->dpll_hw_state.cfgcr1, + pipe_config->dpll_hw_state.cfgcr2); + }else if (HAS_DDI (dev)) { +DRM_DEBUG_KMS ("dpll_hw_state: wrpll: 0x%x\n" , + pipe_config->dpll_hw_state.wrpll); + }else { +DRM_DEBUG_KMS ("dpll_hw_state: dpll: 0x%x, dpll_md: 0x%x, fp0: 0x%x, dp1: 0x%x\n" , + pipe_config->dpll_hw_state.dpll, + pipe_config->dpll_hw_state.dpll_md, + pipe_config->dpll_hw_state.fp0, + pipe_config->dpll_hw_state.fp1); + } +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);
Signature · 6 lines
2.4.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Output scaler related pipe config debug in a single line
From: Tvrtko Ursulin <[email protected]>
Just so it is grouped logically in line with other data and makes a rather verbose output a bit shorter.
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -3
@@ -11404,9 +11404,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("port clock: %d\n" , pipe_config->port_clock);DRM_DEBUG_KMS ("pipe src size: %dx%d\n" , pipe_config->pipe_src_w, pipe_config->pipe_src_h); -DRM_DEBUG_KMS ("num_scalers: %d\n" , crtc->num_scalers); -DRM_DEBUG_KMS ("scaler_users: 0x%x\n" , pipe_config->scaler_state.scaler_users); -DRM_DEBUG_KMS ("scaler id: %d\n" , pipe_config->scaler_state.scaler_id); +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,
Signature · 6 lines
2.4.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Output scaler related pipe config debug in a single line
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Just so it is grouped logically in line with other data and makes a rather verbose output a bit shorter.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chandra Konduru <[email protected]>
Signature · 1 line
Damien
Quoted 29 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_display.c +4
-3@@ -11404,9 +11404,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("port clock: %d\n" , pipe_config->port_clock);DRM_DEBUG_KMS ("pipe src size: %dx%d\n" , pipe_config->pipe_src_w, pipe_config->pipe_src_h); -DRM_DEBUG_KMS ("num_scalers: %d\n" , crtc->num_scalers); -DRM_DEBUG_KMS ("scaler_users: 0x%x\n" , pipe_config->scaler_state.scaler_users); -DRM_DEBUG_KMS ("scaler id: %d\n" , pipe_config->scaler_state.scaler_id); +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,Signature · 6 lines
2.4.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Output scaler related pipe config debug in a single line
In reply to Tvrtko UrsulinTask id: 6409 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 234/234 234/234 ILK 262/262 262/262 SNB -1 282/282 281/282 IVB 300/300 300/300 BYT 254/254 254/254 BDW 275/275 275/275
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
SNB igt@pm_rpm@dpms-mode-unset-non-lpsp DMESG_WARN(4)PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Output scaler related pipe config debug in a single line
In reply to Tvrtko UrsulinQuoted 44 lines
-----Original Message-----
From: Tvrtko Ursulin [mailto:[email protected]]
Sent: Wednesday, May 13, 2015 8:51 AM
To: [email protected]
Cc: Ursulin, Tvrtko; Konduru, Chandra
Subject: [PATCH 2/2] drm/i915: Output scaler related pipe config debug in a single lineFrom: Tvrtko Ursulin <[email protected]>
Just so it is grouped logically in line with other data and makes a rather verbose output a bit shorter.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chandra Konduru <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_display.c +1
-3@@ -11404,9 +11404,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("port clock: %d\n" , pipe_config->port_clock);DRM_DEBUG_KMS ("pipe src size: %dx%d\n" , pipe_config->pipe_src_w, pipe_config->pipe_src_h); -DRM_DEBUG_KMS ("num_scalers: %d\n" , crtc->num_scalers); -DRM_DEBUG_KMS ("scaler_users: 0x%x\n" , pipe_config- >scaler_state.scaler_users); -DRM_DEBUG_KMS ("scaler id: %d\n" , pipe_config- >scaler_state.scaler_id); + DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id:%d\n",
drivers/gpu/drm/i915/intel_display.c +3
-0+ 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, lvdsborder: 0x%08x\n",
drivers/gpu/drm/i915/intel_display.c +0
-1pipe_config->gmch_pfit.control, pipe_config->gmch_pfit.pgm_ratios, --
Quoted 1 line
2.4.0
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH 2/2] drm/i915: Output scaler related pipe config debug in a single line
Quoted 17 lines · Chandra
Reviewed-by Chandra Konduru <[email protected]>Quoted 15 lines
-----Original Message-----
From: Tvrtko Ursulin [mailto:[email protected]]
Sent: Wednesday, May 13, 2015 8:51 AM
To: [email protected]
Cc: Ursulin, Tvrtko; Konduru, Chandra
Subject: [PATCH 2/2] drm/i915: Output scaler related pipe config debug in a single lineFrom: Tvrtko Ursulin <[email protected]>
Just so it is grouped logically in line with other data and makes a rather verbose output a bit shorter.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chandra Konduru <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 35 lines
Quoted 29 lines
--- drivers/gpu/drm/i915/intel_display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_display.c +1
-3@@ -11404,9 +11404,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("port clock: %d\n" , pipe_config->port_clock);DRM_DEBUG_KMS ("pipe src size: %dx%d\n" , pipe_config->pipe_src_w, pipe_config->pipe_src_h); -DRM_DEBUG_KMS ("num_scalers: %d\n" , crtc->num_scalers); -DRM_DEBUG_KMS ("scaler_users: 0x%x\n" , pipe_config- >scaler_state.scaler_users); -DRM_DEBUG_KMS ("scaler id: %d\n" , pipe_config- >scaler_state.scaler_id); + DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id:%d\n",
drivers/gpu/drm/i915/intel_display.c +3
-0+ 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, lvdsborder: 0x%08x\n",
drivers/gpu/drm/i915/intel_display.c +0
-1pipe_config->gmch_pfit.control, pipe_config->gmch_pfit.pgm_ratios, --Quoted 1 line
2.4.0
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Tried to get the platform split right, please shout if I failed.
Signed-off-by Tvrtko Ursulin <[email protected]>
So, previously, we used to dump the whole list of states, even when the platform didn't care about all of them. I do like a platform-aware dump of the state better and this looks right to me (surely we can break the strings at a ','!).
You probably also want to add pipe_config->ddi_pll_sel on DDI platforms as it encodes the actual PLL selection (at least) and maybe look at the other DPLL-related states in there (I can give a r-b tag without those :p)
A small typo below.
Signature · 1 line
Damien
Quoted 22 lines
--- drivers/gpu/drm/i915/intel_display.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)drivers/gpu/drm/i915/intel_display.c +10
-0@@ -11418,6 +11418,32 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("ips: %i\n" , pipe_config->ips_enabled);DRM_DEBUG_KMS ("double wide: %i\n" , pipe_config->double_wide); +if (IS_BROXTON (dev)) { +DRM_DEBUG_KMS ("dpll_hw_state: ebb0: 0x%x, pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, pll6: 0x%x, pll8: 0x%x, pcsdw12: 0x%x\n" , + pipe_config->dpll_hw_state.ebb0, + pipe_config->dpll_hw_state.pll0, + pipe_config->dpll_hw_state.pll1, + pipe_config->dpll_hw_state.pll2, + pipe_config->dpll_hw_state.pll3, + pipe_config->dpll_hw_state.pll6, + pipe_config->dpll_hw_state.pll8, + pipe_config->dpll_hw_state.pcsdw12);
drivers/gpu/drm/i915/intel_display.c static void intel_dump_pipe_config(struct intel_crtc *crtc, · line 11440
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+ }else if (IS_SKYLAKE (dev)) { +DRM_DEBUG_KMS ("dpll_hw_state: ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n" , + pipe_config->dpll_hw_state.ctrl1, + pipe_config->dpll_hw_state.cfgcr1, + pipe_config->dpll_hw_state.cfgcr2); + }else if (HAS_DDI (dev)) { +DRM_DEBUG_KMS ("dpll_hw_state: wrpll: 0x%x\n" , + pipe_config->dpll_hw_state.wrpll); + }else { + DRM_DEBUG_KMS("dpll_hw_state: dpll: 0x%x, dpll_md: 0x%x, fp0: 0x%x, dp1: 0x%x\n",
fp1
Quoted 16 lines
drivers/gpu/drm/i915/intel_display.c +6
-0+ pipe_config->dpll_hw_state.dpll, + pipe_config->dpll_hw_state.dpll_md, + pipe_config->dpll_hw_state.fp0, + pipe_config->dpll_hw_state.fp1); + } +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);Signature · 6 lines
2.4.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Damien Lespiau
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Tried to get the platform split right, please shout if I failed.
Signed-off-by Tvrtko Ursulin <[email protected]>So, previously, we used to dump the whole list of states, even when the platform didn't care about all of them. I do like a platform-aware dump of the state better and this looks right to me (surely we can break the strings at a ','!).
Quoted 6 lines
You probably also want to add
pipe_config->ddi_pll_selon DDI platforms as it encodes the actual PLL selection (at least) and maybe look at the other DPLL-related states in there (I can give a r-b tag without those :p)A small typo below.
Not convinced, for the same reason that we don't have platform checks (except where absolutely necessary) in the pipe_config_compare code: No one will notice bug here until it's too late. Otoh the pipe dump code always seems to be lacking.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx