SKL eDP clocks
Subsystems (2)
cover SKL eDP clocks
The previous clock series didn't include the eDP side of it. This should address most of it, for now.
Note that I have some issues with HBR2 and link training here and I'm trying to find more information about this. So depending on the configuration (number of lanes wired, panel bw) this series may not be enough to light up an eDP panel.
Signature · 21 lines
Damien
Damien Lespiau (4):
drm/i915/skl: Remove spurious warn in get_ddi_pll()
drm/i915/skl: Set the eDP link rate on DPLL0
drm/i915/skl: Use the pipe config DPLL tracking to query the link
clock
drm/i915/skl: Read out crtl1 for eDP/DPLL0
drivers/gpu/drm/i915/intel_ddi.c | 34 +++++++++++++++++++++++++++++-----
drivers/gpu/drm/i915/intel_display.c | 2 --
drivers/gpu/drm/i915/intel_dp.c | 31 ++++++++++++++++++++++++++++++-
3 files changed, 59 insertions(+), 8 deletions(-)
--
1.8.3.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxPATCH 1/4 drm/i915/skl: Remove spurious warn in get_ddi_pll()
When reading out a DDI config that uses a PLL that is not part of the shared_dpll scheme (DPLL0), it's totally normal to end up in the
default: case of that switch.
--- drivers/gpu/drm/i915/intel_display.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
@@ -8029,8 +8029,6 @@ static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,case SKL_DPLL3 : pipe_config->shared_dpll =DPLL_ID_SKL_DPLL3 ;break ; -default : -WARN (1 ,"Unknown DPLL programmed\n" ); } }
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/4] drm/i915/skl: Remove spurious warn in get_ddi_pll()
2014-11-14 15:24 GMT-02:00 Damien Lespiau <[email protected]>:
Quoted 3 lines
When reading out a DDI config that uses a PLL that is not part of the
shared_dpllscheme (DPLL0), it's totally normal to end up in the
default: case of that switch.
Quoted 26 lines
Signed-off-by Damien Lespiau <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-3@@ -8029,8 +8029,6 @@ static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,case SKL_DPLL3 : pipe_config->shared_dpll =DPLL_ID_SKL_DPLL3 ;break ; -default : -WARN (1 ,"Unknown DPLL programmed\n" ); } } --1.8.3.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Paulo Zanoni _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915/skl: Set the eDP link rate on DPLL0
In reply to Damien LespiauOn SKL DPLL0 is used to derive CDCLK but can also be used to drive an eDP port (as long as we don't want SSC). DPLL0 is special enough to not be handled by the shared DPLL framework (drives CDCLK, not supposed to enable the HDMI mode), So we need to compute the configuration separately from the other DPLLs.
Note that we don't need to reprogram DPLL0 (which would mean bringing down CDCLK) to support the various eDP 1.3 link rates as they all share the same VCO (8100).
--- drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +20 -0
@@ -1484,6 +1484,25 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)uint32_t dpll = crtc->config.ddi_pll_sel;uint32_t val; +/* +* DPLL0 is used for eDP and is the only "private" DPLL (as +* opposed to shared) on SKL +*/ +if (type ==INTEL_OUTPUT_EDP ) { +WARN_ON (dpll !=SKL_DPLL0 ); + + val =I915_READ (DPLL_CTRL1 ); + + val &= ~(DPLL_CTRL1_HDMI_MODE (dpll) | +DPLL_CTRL1_SSC (dpll) | +DPLL_CRTL1_LINK_RATE_MASK (dpll)); + val |= crtc->config.dpll_hw_state.ctrl1 << (dpll *6 ); + +I915_WRITE (DPLL_CTRL1 , val); +POSTING_READ (DPLL_CTRL1 ); + } + +/* DDI -> PLL mapping */ val =I915_READ (DPLL_CTRL2 ); val &= ~(DPLL_CTRL2_DDI_CLK_OFF(port) |
@@ -1492,6 +1511,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder) DPLL_CTRL2_DDI_SEL_OVERRIDE(port));I915_WRITE (DPLL_CTRL2 , val); + }else {WARN_ON (crtc->config.ddi_pll_sel ==PORT_CLK_SEL_NONE );I915_WRITE (PORT_CLK_SEL (port), crtc->config.ddi_pll_sel);
drivers/gpu/drm/i915/intel_dp.c +30 -1
@@ -1075,6 +1075,33 @@ intel_dp_connector_unregister(struct intel_connector *intel_connector) }static void +skl_edp_set_pll_config (struct intel_crtc_config *pipe_config,int link_bw) +{ +u32 ctrl1; + + pipe_config->ddi_pll_sel =SKL_DPLL0 ; + pipe_config->dpll_hw_state.cfgcr1 =0 ; + pipe_config->dpll_hw_state.cfgcr2 =0 ; + + ctrl1 =DPLL_CTRL1_OVERRIDE (SKL_DPLL0 ); +switch (link_bw) { +case DP_LINK_BW_1_62 : + ctrl1 |=DPLL_CRTL1_LINK_RATE (DPLL_CRTL1_LINK_RATE_810 , +SKL_DPLL0 ); +break ; +case DP_LINK_BW_2_7 : + ctrl1 |=DPLL_CRTL1_LINK_RATE (DPLL_CRTL1_LINK_RATE_1350 , +SKL_DPLL0 ); +break ; +case DP_LINK_BW_5_4 : + ctrl1 |=DPLL_CRTL1_LINK_RATE (DPLL_CRTL1_LINK_RATE_2700 , +SKL_DPLL0 ); +break ; + } + pipe_config->dpll_hw_state.ctrl1 = ctrl1; +} + +static void hsw_dp_set_ddi_pll_sel (struct intel_crtc_config *pipe_config,int link_bw) {switch (link_bw) {
@@ -1251,7 +1278,9 @@ found: &pipe_config->dp_m2_n2); } -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +if (IS_SKYLAKE (dev) &&is_edp (intel_dp)) +skl_edp_set_pll_config (pipe_config, intel_dp->link_bw); +else if (IS_HASWELL (dev) ||IS_BROADWELL (dev))hsw_dp_set_ddi_pll_sel (pipe_config, intel_dp->link_bw);else intel_dp_set_clock (encoder, pipe_config, intel_dp->link_bw);
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm/i915/skl: Set the eDP link rate on DPLL0
Quoted 21 lines · Damien Lespiau
On SKL DPLL0 is used to derive CDCLK but can also be used to drive an eDP port (as long as we don't want SSC). DPLL0 is special enough to not be handled by the shared DPLL framework (drives CDCLK, not supposed to enable the HDMI mode), So we need to compute the configuration separately from the other DPLLs.
Note that we don't need to reprogram DPLL0 (which would mean bringing down CDCLK) to support the various eDP 1.3 link rates as they all share the same VCO (8100).
Signed-off-by Damien Lespiau <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0
drivers/gpu/drm/i915/intel_ddi.c static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder) · line 1491
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c +5
-0@@ -1484,6 +1484,25 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)uint32_t dpll = crtc->config.ddi_pll_sel;uint32_t val; +/* +* DPLL0 is used for eDP and is the only "private" DPLL (as +* opposed to shared) on SKL +*/ +if (type ==INTEL_OUTPUT_EDP ) {
Are you sure you really want to check for edp here and not for something more specific like port A? Same with the is_edp check below.
In the past we've had piles of fun with code that checked for is_edp, but which should have checked for port A or something similar - on desktop platforms (at least in all chips thus far, dunno about skl) edp ends up on port D.
Oh and someone bored might want to replace the pile of type == DP || type == EDP checks in intel_ddi.c with config->has_dp_encoder.
I'll hold off on merging this for now just out of curiosity ;-) -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915/skl: Use the pipe config DPLL tracking to query the link clock
In reply to Damien Lespiau--- drivers/gpu/drm/i915/intel_ddi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +1 -5
@@ -735,14 +735,10 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, struct intel_crtc_config *pipe_config) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; -enum port port =intel_ddi_get_encoder_port (encoder);int link_clock =0 ;uint32_t dpll_ctl1, dpll; -/* FIXME: This should be tracked in the pipe config. */ - dpll =I915_READ (DPLL_CTRL2 ); - dpll &=DPLL_CTRL2_DDI_CLK_SEL_MASK (port); - dpll >>=DPLL_CTRL2_DDI_CLK_SEL_SHIFT (port); + dpll = pipe_config->ddi_pll_sel; dpll_ctl1 =I915_READ (DPLL_CTRL1 );
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915/skl: Read out crtl1 for eDP/DPLL0
In reply to Damien Lespiau--- drivers/gpu/drm/i915/intel_ddi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_ddi.c +8 -0
@@ -767,12 +767,20 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, pipe_config->port_clock = link_clock; +/* +* On SKL the eDP DPLL (DPLL0 as we don't use SSC) is not part of the +* shared DPLL framework and thus needs to be read out separately +*/ +if (encoder->type ==INTEL_OUTPUT_EDP ) + pipe_config->dpll_hw_state.ctrl1 = (dpll_ctl1 >> (dpll *6 )) &0x3f ; +if (pipe_config->has_dp_encoder) pipe_config->adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->dp_m_n);else pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; + } static void hsw_ddi_clock_get(struct intel_encoder *encoder,
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/291->290/291
PNV: pass/total=352/356->356/356
ILK: pass/total=371/372->364/372
IVB: pass/total=545/546->545/546
SNB: pass/total=424/425->424/425
HSW: pass/total=579/579->579/579
BDW: pass/total=434/435->434/435
-------------------------------------Detailed-------------------------------------test_platform: test_suite, test_case, result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count, machine_id)...
PNV: Intel_gpu_tools, igt_gen3_mixed_blits, DMESG_WARN(1, M23) -> PASS(4, M7)
PNV: Intel_gpu_tools, igt_gen3_render_mixed_blits, CRASH(1, M23) -> PASS(1, M7)
PNV: Intel_gpu_tools, igt_gen3_render_tiledx_blits, CRASH(1, M23) -> PASS(1, M7)
PNV: Intel_gpu_tools, igt_gen3_render_tiledy_blits, CRASH(1, M23) -> PASS(1, M7)
ILK: Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank, DMESG_WARN(1, M26)PASS(3, M37M26) -> DMESG_WARN(2, M26)PASS(2, M26)
ILK: Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible, DMESG_WARN(1, M26)PASS(3, M37M26) -> DMESG_WARN(1, M26)PASS(3, M26)
ILK: Intel_gpu_tools, igt_kms_flip_flip-vs-modeset-vs-hang-interruptible, PASS(4, M37M26) -> NSPT(1, M26)PASS(3, M26)
ILK: Intel_gpu_tools, igt_kms_flip_flip-vs-wf_vblank-interruptible, DMESG_WARN(1, M26)PASS(3, M37M26) -> DMESG_WARN(1, M26)PASS(3, M26)
ILK: Intel_gpu_tools, igt_kms_flip_plain-flip, PASS(4, M37M26) -> DMESG_WARN(2, M26)PASS(2, M26)
ILK: Intel_gpu_tools, igt_kms_flip_plain-flip-interruptible, PASS(4, M37M26) -> DMESG_WARN(2, M26)PASS(2, M26)
ILK: Intel_gpu_tools, igt_kms_flip_rcs-flip-vs-modeset-interruptible, PASS(4, M37M26) -> DMESG_WARN(1, M26)PASS(3, M26)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
Hi Shuang,
You wanted suggestions, so how about:
For both examples, to determine the size of the column, I'd take the length of the longest value of that column (including the title) and add 4 to account for spacing. Left alignment for text, right alignement for numbers (of course, all of that is debatable).
Quoted 10 lines · On Fri, Nov 14, 2014 at 09:28:03PM -0800, [email protected] wrote:
-------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/291->290/291
PNV: pass/total=352/356->356/356
ILK: pass/total=371/372->364/372
IVB: pass/total=545/546->545/546
SNB: pass/total=424/425->424/425
HSW: pass/total=579/579->579/579
BDW: pass/total=434/435->434/435
For this one:
- a bit more spacing
- some table-like alignment. That's assuming the mail client will use monospaced fonts for text emails, it really should.
- add the delta so it's easier to parse the interesting information
- sort by gens
- baseline_drm_intel_nightly_pass_rate can really just be drm-intel-nightly
- it's not just a single patch applied, so series applied?
Platform Delta drm-intel-nightly Series Applied
--------------------------------------------------------
PNV +4 352/356 356/356 ILK -7 371/372 364/372 SNB 0 424/425 424/425 IVB 0 545/546 545/546 BYT 0 290/291 290/291 HSW 0 579/579 579/579 BDW 0 434/435 434/435
Quoted 5 lines
-------------------------------------Detailed-------------------------------------
test_platform:test_suite,test_case,result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count,machine_id)...
PNV:Intel_gpu_tools,igt_gen3_mixed_blits,DMESG_WARN(1, M23)->PASS(4, M7)
PNV:Intel_gpu_tools,igt_gen3_render_mixed_blits,CRASH(1, M23)->PASS(1, M7)
PNV:Intel_gpu_tools,igt_gen3_render_tiledx_blits,CRASH(1, M23)->PASS(1, M7)
Quoted 8 lines
PNV:
Intel_gpu_tools,igt_gen3_render_tiledy_blits,CRASH(1, M23)->PASS(1, M7)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank,DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible,DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-modeset-vs-hang-interruptible,PASS(4, M37M26)->NSPT(1, M26)PASS(3, M26)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-wf_vblank-interruptible,DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)
ILK:Intel_gpu_tools, igt_kms_flip_plain-flip,PASS(4, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)
ILK:Intel_gpu_tools, igt_kms_flip_plain-flip-interruptible,PASS(4, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)
ILK:Intel_gpu_tools, igt_kms_flip_rcs-flip-vs-modeset-interruptible,PASS(4, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)
And for this one:
- it's not nessary to repeat the test suite name for every single row, if needed at all (I don't think it is when replying to kernel patches), it can be put beforehand.
- sorted by gen
- The machine id isn't useful in this report
- It'd be nice to add a some explanations on how to decipher the result column (what is the count, what the various states mean). Maybe after the table as it only needs to be read a few times to get it.
Platform Test drm-intel-nightly Series Applied
-------------------------------------------------------------------------------------------------------------------
ILK igt_kms_flip_flip-vs-absolute-wf_vblank DMESG_WARN(1) PASS(3) DMESG_WARN(2) PASS(2) ILK igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible DMESG_WARN(1) PASS(3) DMESG_WARN(1) PASS(3)
..
HTH,
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
Quoted 21 lines · Damien Lespiau
Hi Shuang,
You wanted suggestions, so how about:
For both examples, to determine the size of the column, I'd take the length of the longest value of that column (including the title) and add 4 to account for spacing. Left alignment for text, right alignement for numbers (of course, all of that is debatable).
Quoted 10 lines · On Fri, Nov 14, 2014 at 09:28:03PM -0800, [email protected] wrote:
-------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/291->290/291
PNV: pass/total=352/356->356/356
ILK: pass/total=371/372->364/372
IVB: pass/total=545/546->545/546
SNB: pass/total=424/425->424/425
HSW: pass/total=579/579->579/579
BDW: pass/total=434/435->434/435
Quoted 6 lines
For this one:
- a bit more spacing
- some table-like alignment. That's assuming the mail client will use monospaced fonts for text emails, it really should.
- add the delta so it's easier to parse the interesting information
I think the delta should mention both + and - counts separately so that it's easy to see when a patch regressed the same amount of tests as it fixed. Iirc there's been a few cases before where this was important.
Otherwise I agree with damien, the column aligment and headers make the results a lot easier to read.
-Daniel
Quoted 56 lines
- sort by gens
-baseline_drm_intel_nightly_pass_ratecan really just be drm-intel-nightly
- it's not just a single patch applied, so series applied?Platform Delta drm-intel-nightly Series Applied
--------------------------------------------------------PNV +4 352/356 356/356 ILK -7 371/372 364/372 SNB 0 424/425 424/425 IVB 0 545/546 545/546 BYT 0 290/291 290/291 HSW 0 579/579 579/579 BDW 0 434/435 434/435Quoted 5 lines
-------------------------------------Detailed-------------------------------------
test_platform:test_suite,test_case,result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count,machine_id)...
PNV:Intel_gpu_tools,igt_gen3_mixed_blits,DMESG_WARN(1, M23)->PASS(4, M7)
PNV:Intel_gpu_tools,igt_gen3_render_mixed_blits,CRASH(1, M23)->PASS(1, M7)
PNV:Intel_gpu_tools,igt_gen3_render_tiledx_blits,CRASH(1, M23)->PASS(1, M7)Quoted 8 lines
PNV:
Intel_gpu_tools,igt_gen3_render_tiledy_blits,CRASH(1, M23)->PASS(1, M7)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank,DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible,DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-modeset-vs-hang-interruptible,PASS(4, M37M26)->NSPT(1, M26)PASS(3, M26)
ILK:Intel_gpu_tools, igt_kms_flip_flip-vs-wf_vblank-interruptible,DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)
ILK:Intel_gpu_tools, igt_kms_flip_plain-flip,PASS(4, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)
ILK:Intel_gpu_tools, igt_kms_flip_plain-flip-interruptible,PASS(4, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)
ILK:Intel_gpu_tools, igt_kms_flip_rcs-flip-vs-modeset-interruptible,PASS(4, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)And for this one:
- it's not nessary to repeat the test suite name for every single row, if needed at all (I don't think it is when replying to kernel patches), it can be put beforehand.
- sorted by gen
- The machine id isn't useful in this report
- It'd be nice to add a some explanations on how to decipher the result column (what is the count, what the various states mean). Maybe after the table as it only needs to be read a few times to get it.Platform Test drm-intel-nightly Series Applied
-------------------------------------------------------------------------------------------------------------------ILK igt_kms_flip_flip-vs-absolute-wf_vblank DMESG_WARN(1) PASS(3) DMESG_WARN(2) PASS(2) ILK igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible DMESG_WARN(1) PASS(3) DMESG_WARN(1) PASS(3)..
HTH,
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
Quoted 32 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Monday, November 17, 2014 11:03 PM
To: Lespiau, Damien
Cc: He, Shuang; [email protected]
Subject: Re: [Intel-gfx] [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0Quoted 11 lines · Damien Lespiau
Hi Shuang,
You wanted suggestions, so how about:
For both examples, to determine the size of the column, I'd take the length of the longest value of that column (including the title) and add 4 to account for spacing. Left alignment for text, right alignement for numbers (of course, all of that is debatable).
Quoted 1 line · On Fri, Nov 14, 2014 at 09:28:03PM -0800, [email protected] wrote:
Tested-by PRC QA PRTS (Patch Regression Test System Contact:Quoted 12 lines
Quoted 9 lines
-------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/291->290/291
PNV: pass/total=352/356->356/356
ILK: pass/total=371/372->364/372
IVB: pass/total=545/546->545/546
SNB: pass/total=424/425->424/425
HSW: pass/total=579/579->579/579
BDW: pass/total=434/435->434/435For this one:
Quoted 8 lines
Quoted 4 lines
- a bit more spacing
- some table-like alignment. That's assuming the mail client will use monospaced fonts for text emails, it really should.
- add the delta so it's easier to parse the interesting informationI think the delta should mention both + and - counts separately so that it's easy to see when a patch regressed the same amount of tests as it fixed. Iirc there's been a few cases before where this was important.
[He, Shuang] Agree with that, it's kind of like patch
Thanks
--Shuang
Quoted 82 lines
Otherwise I agree with damien, the column aligment and headers make the results a lot easier to read.
-DanielQuoted 7 lines
- sort by gens
-baseline_drm_intel_nightly_pass_ratecan really just be drm-intel-nightly
- it's not just a single patch applied, so series applied?Platform Delta drm-intel-nightly Series Applied
--------------------------------------------------------Quoted 11 lines
PNV +4 352/356 356/356 ILK -7 371/372 364/372 SNB 0 424/425 424/425 IVB 0 545/546 545/546 BYT 0 290/291 290/291 HSW 0 579/579 579/579 BDW 0 434/435 434/435Quoted 2 lines
-------------------------------------Detailed-------------------------------------
test_platform:test_suite,test_case, result_with_drm_intel_nightly(count,machine_id...)...->result_with_patch_applied(count,
machine_id)...Quoted 1 line
Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_mixed_blits,DMESG_WARN(1, M23)->
PASS(4, M7)Quoted 1 line
Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_render_mixed_blits,CRASH(1, M23)->
PASS(1, M7)Quoted 1 line
Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_render_tiledx_blits,CRASH(1, M23)->
PASS(1, M7)Quoted 1 line
Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_render_tiledy_blits,CRASH(1, M23)->
PASS(1, M7)Quoted 1 line
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank,
DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)Quoted 1 line
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible,
DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)Quoted 1 line
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-modeset-vs-hang-interruptible,
PASS(4, M37M26)->NSPT(1, M26)PASS(3, M26)Quoted 1 line
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-wf_vblank-interruptible,
DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)Quoted 1 line
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_plain-flip,PASS(4, M37M26)->
DMESG_WARN(2, M26)PASS(2, M26)Quoted 1 line
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_plain-flip-interruptible,PASS(4, M37M26)->
DMESG_WARN(2, M26)PASS(2, M26)Quoted 1 line
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_rcs-flip-vs-modeset-interruptible, PASS(4,M37M26) ->
DMESG_WARN(1, M26)PASS(3, M26)Quoted 13 lines
And for this one:
- it's not nessary to repeat the test suite name for every single row, if needed at all (I don't think it is when replying to kernel patches), it can be put beforehand.
- sorted by gen
- The machine id isn't useful in this report
- It'd be nice to add a some explanations on how to decipher the result column (what is the count, what the various states mean). Maybe after the table as it only needs to be read a few times to get it.Quoted 1 line
Platform Test
drm-intel-nightly Series Applied
Quoted 1 line
----------------------------------------------------------------------------------------------------------------
---Quoted 1 line
ILK igt_kms_flip_flip-vs-absolute-wf_vblank
DMESG_WARN(1)PASS(3)DMESG_WARN(2)PASS(2)Quoted 1 line
ILK igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible
DMESG_WARN(1)PASS(3)DMESG_WARN(1)PASS(3)Quoted 10 lines
..
HTH,
--
Damien
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
In reply to Damien LespiauQuoted 7 lines
-----Original Message-----
From: Lespiau, Damien
Sent: Saturday, November 15, 2014 6:55 PM
To: He, Shuang
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
Quoted 8 lines
Hi Shuang,
You wanted suggestions, so how about:
For both examples, to determine the size of the column, I'd take the length of the longest value of that column (including the title) and add 4 to account for spacing. Left alignment for text, right alignement for numbers (of course, all of that is debatable).
[He, Shuang] Hello, Damien, Thanks for your great input, we'll check how those suggestion could be integrated, I've created one jira task to track it: https://jira01.devtools.intel.com/browse/VIZ-4672
Quoted 14 lines · On Fri, Nov 14, 2014 at 09:28:03PM -0800, [email protected] wrote:
Quoted 1 line
Tested-by PRC QA PRTS (Patch Regression Test System Contact:Quoted 9 lines
-------------------------------------Summary-------------------------------------
Platform:baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/291->290/291
PNV: pass/total=352/356->356/356
ILK: pass/total=371/372->364/372
IVB: pass/total=545/546->545/546
SNB: pass/total=424/425->424/425
HSW: pass/total=579/579->579/579
BDW: pass/total=434/435->434/435
Quoted 7 lines
For this one:
- a bit more spacing
- some table-like alignment. That's assuming the mail client will use monospaced fonts for text emails, it really should.
- add the delta so it's easier to parse the interesting information
- sort by gens
[He, Shuang] yes, this makes sense
Quoted 2 lines
-
baseline_drm_intel_nightly_pass_ratecan really just be drm-intel-nightly
[He, Shuang] yes, this makes sense
Quoted 1 line
- it's not just a single patch applied, so series applied?
[He, Shuang] yes, it's series applied
Quoted 38 lines
Platform Delta drm-intel-nightly Series Applied
--------------------------------------------------------PNV +4 352/356 356/356 ILK -7 371/372 364/372 SNB 0 424/425 424/425 IVB 0 545/546 545/546 BYT 0 290/291 290/291 HSW 0 579/579 579/579 BDW 0 434/435 434/435Quoted 2 lines
-------------------------------------Detailed-------------------------------------
test_platform:test_suite,test_case, result_with_drm_intel_nightly(count,machine_id...)...->result_with_patch_applied(count,
machine_id)...Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_mixed_blits,DMESG_WARN(1, M23)->
PASS(4, M7)Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_render_mixed_blits,CRASH(1, M23)->
PASS(1, M7)Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_render_tiledx_blits,CRASH(1, M23)-> PASS(1,M7)
Quoted 1 line
PNV:
Intel_gpu_tools,igt_gen3_render_tiledy_blits,CRASH(1, M23)-> PASS(1,M7)
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank,
DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(2, M26)PASS(2, M26)Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible,
DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-modeset-vs-hang-interruptible,
PASS(4, M37M26)->NSPT(1, M26)PASS(3, M26)Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_flip-vs-wf_vblank-interruptible,
DMESG_WARN(1, M26)PASS(3, M37M26)->DMESG_WARN(1, M26)PASS(3, M26)Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_plain-flip,PASS(4, M37M26)->
DMESG_WARN(2, M26)PASS(2, M26)Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_plain-flip-interruptible,PASS(4, M37M26)->
DMESG_WARN(2, M26)PASS(2, M26)
Quoted 8 lines
Quoted 1 line
ILK:
Intel_gpu_tools, igt_kms_flip_rcs-flip-vs-modeset-interruptible, PASS(4,M37M26) ->
DMESG_WARN(1, M26)PASS(3, M26)And for this one:
- it's not nessary to repeat the test suite name for every single row, if needed at all (I don't think it is when replying to kernel patches), it can be put beforehand.
[He, Shuang] this makes sense
Quoted 2 lines
- sorted by gen
- The machine id isn't useful in this report
[He, Shuang] Some time, test result diffs because of Machine have changed, machine id is put there to help understand the issue
Quoted 4 lines
- It'd be nice to add a some explanations on how to decipher the result column (what is the count, what the various states mean). Maybe after the table as it only needs to be read a few times to get it.
[He, Shuang] yes, it may help. I'm always be hesitating on how to put these things in the right position. I'll see if your way could help
Quoted 11 lines
Platform Test
drm-intel-nightly Series Applied
----------------------------------------------------------------------------------------------------------------
---
ILK igt_kms_flip_flip-vs-absolute-wf_vblankDMESG_WARN(1)PASS(3)DMESG_WARN(2)PASS(2)
ILK igt_kms_flip_flip-vs-absolute-wf_vblank-interruptibleDMESG_WARN(1)PASS(3)DMESG_WARN(1)PASS(3)
..
Quoted 1 line
HTH,
[He, Shuang] By the way, What is HTH? "Hope to help"? :)
Quoted 3 lines
--
Damien
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
In reply to Damien LespiauQuoted 10 lines · Damien Lespiau
Signed-off-by Damien Lespiau <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/i915/intel_ddi.c +0
-0
drivers/gpu/drm/i915/intel_ddi.c static void skl_ddi_clock_get(struct intel_encoder *encoder, · line 774
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c +5
-0@@ -767,12 +767,20 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, pipe_config->port_clock = link_clock; +/* +* On SKL the eDP DPLL (DPLL0 as we don't use SSC) is not part of the +* shared DPLL framework and thus needs to be read out separately +*/ +if (encoder->type ==INTEL_OUTPUT_EDP )
Hw state readout shouldn't depend upon our sw state, and given the multiple personality nature of DDI ports I think this is the case here: We might have a different opinion than the bios guys about what's edp (it happened) or how consistently to apply this clock selection algo (also happened). So might be better to stuff this into the ddi clock readout code (the one where you patched away the WARN for DPLL0 I guess).
Merged patch 3 meanwhile, thanks.
-Daniel
Quoted 19 lines
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ pipe_config->dpll_hw_state.ctrl1 = (dpll_ctl1 >> (dpll *6 )) &0x3f ; +if (pipe_config->has_dp_encoder) pipe_config->adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->dp_m_n);else pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; + } static void hsw_ddi_clock_get(struct intel_encoder *encoder,Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915/skl: Read out crtl1 for eDP/DPLL0
Quoted 14 lines · Daniel Vetter
Quoted 13 lines · Damien Lespiau
Signed-off-by Damien Lespiau <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -767,12 +767,20 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, pipe_config->port_clock = link_clock;
Quoted 12 lines
drivers/gpu/drm/i915/intel_ddi.c static void skl_ddi_clock_get(struct intel_encoder *encoder, · line 774
Quoted 5 lines
drivers/gpu/drm/i915/intel_ddi.c +5
-0+/* +* On SKL the eDP DPLL (DPLL0 as we don't use SSC) is not part of the +* shared DPLL framework and thus needs to be read out separately +*/ +if (encoder->type ==INTEL_OUTPUT_EDP )Hw state readout shouldn't depend upon our sw state, and given the multiple personality nature of DDI ports I think this is the case here: We might have a different opinion than the bios guys about what's edp (it happened) or how consistently to apply this clock selection algo (also happened). So might be better to stuff this into the ddi clock readout code (the one where you patched away the WARN for DPLL0 I guess).
And after a night of pondering I stand correct on our irc discussion about putting dpll0 into the shared dpll infrastructure - if the bios indeed does something we don't expect and we don't properly track the use count for dpll0 it'll blow up. So I guess we'll need indeed need that. -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/skl: Read out crtl1 for eDP/DPLL0
In reply to Daniel Vetterv2: Put the DPLL0 state readout in skylake_get_ddi_pll(), closer to where the PLL assignement read out is done rather than the frequency readout function. (Daniel)
--- drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_display.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +1 -0
@@ -773,6 +773,7 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, &pipe_config->dp_m_n); else pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; + } static void hsw_ddi_clock_get(struct intel_encoder *encoder,
drivers/gpu/drm/i915/intel_display.c +10 -1
@@ -7994,12 +7994,21 @@ static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,enum port port, struct intel_crtc_config *pipe_config) { - u32 temp; + u32 temp, dpll_ctl1; temp =I915_READ (DPLL_CTRL2 ) &DPLL_CTRL2_DDI_CLK_SEL_MASK (port); pipe_config->ddi_pll_sel = temp >> (port *3 +1 );switch (pipe_config->ddi_pll_sel) { +case SKL_DPLL0 : +/* +* On SKL the eDP DPLL (DPLL0 as we don't use SSC) is not part +* of the shared DPLL framework and thus needs to be read out +* separately +*/ + dpll_ctl1 =I915_READ (DPLL_CTRL1 ); + pipe_config->dpll_hw_state.ctrl1 = dpll_ctl1 &0x3f ; +break ;case SKL_DPLL1 : pipe_config->shared_dpll =DPLL_ID_SKL_DPLL1 ;break ;
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/skl: Read out crtl1 for eDP/DPLL0
v2: Put the DPLL0 state readout in skylake_get_ddi_pll(), closer to where the PLL assignement read out is done rather than the frequency readout function. (Daniel)
v3: Remove stray new line (Damien)
Add Paulo's r-b tag for v1
--- drivers/gpu/drm/i915/intel_display.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +10 -1
@@ -7994,12 +7994,21 @@ static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,enum port port, struct intel_crtc_config *pipe_config) { - u32 temp; + u32 temp, dpll_ctl1; temp =I915_READ (DPLL_CTRL2 ) &DPLL_CTRL2_DDI_CLK_SEL_MASK (port); pipe_config->ddi_pll_sel = temp >> (port *3 +1 );switch (pipe_config->ddi_pll_sel) { +case SKL_DPLL0 : +/* +* On SKL the eDP DPLL (DPLL0 as we don't use SSC) is not part +* of the shared DPLL framework and thus needs to be read out +* separately +*/ + dpll_ctl1 =I915_READ (DPLL_CTRL1 ); + pipe_config->dpll_hw_state.ctrl1 = dpll_ctl1 &0x3f ; +break ;case SKL_DPLL1 : pipe_config->shared_dpll =DPLL_ID_SKL_DPLL1 ;break ;
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH v3] drm/i915/skl: Read out crtl1 for eDP/DPLL0
Quoted 9 lines · Damien Lespiau
v2: Put the DPLL0 state readout in
skylake_get_ddi_pll(), closer to where the PLL assignement read out is done rather than the frequency readout function. (Daniel)v3: Remove stray new line (Damien)
Add Paulo's r-b tag for v1Reviewed-by Paulo Zanoni <[email protected]> (v1)Signed-off-by Damien Lespiau <[email protected]>
I still think it might be safer to put DPLL0 into the shared infrastructure too just because. But this looks good as-is.
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
2014-11-14 15:24 GMT-02:00 Damien Lespiau <[email protected]>:
Quoted 6 lines
The previous clock series didn't include the eDP side of it. This should address most of it, for now.
Note that I have some issues with HBR2 and link training here and I'm trying to find more information about this. So depending on the configuration (number of lanes wired, panel bw) this series may not be enough to light up an eDP panel.
I couldn't spot anything obvious here...
For all patches: Reviewed-by: Paulo Zanoni <[email protected]>
My bikeshedding would be to replace the magic "(id * 6)" - from patches 2 and 4 - and "0x3f" - from patch 4 - with some nice macro definitions.
Quoted 23 lines
--
DamienDamien Lespiau (4):
drm/i915/skl: Remove spurious warn inget_ddi_pll()drm/i915/skl: Set the eDP link rate on DPLL0 drm/i915/skl: Use the pipe config DPLL tracking to query the link
clock
drm/i915/skl: Read out crtl1 for eDP/DPLL0drivers/gpu/drm/i915/intel_ddi.c | 34 +++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_display.c | 2 -- drivers/gpu/drm/i915/intel_dp.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 8 deletions(-)--
1.8.3.1_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Paulo Zanoni _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Paulo Zanoni
2014-11-14 15:24 GMT-02:00 Damien Lespiau <[email protected]>:
Quoted 6 lines
The previous clock series didn't include the eDP side of it. This should address most of it, for now.
Note that I have some issues with HBR2 and link training here and I'm trying to find more information about this. So depending on the configuration (number of lanes wired, panel bw) this series may not be enough to light up an eDP panel.
I couldn't spot anything obvious here...
For all patches: Reviewed-by: Paulo Zanoni <[email protected]>
Thanks!
Quoted 3 lines
My bikeshedding would be to replace the magic "(id * 6)" - from patches 2 and 4 - and "
0x3f" - from patch 4 - with some nice macro definitions.
Yes, that's also the case for the rest of the SKL DPLL code, the plan is to fix that on top.
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx