drm/i915/bxt: Fix HDMI DPLL configuration
Subsystems (2)
PATCH 1/1 drm/i915/bxt: Fix HDMI DPLL configuration
a277ca7dc01d should've been a no-functional-change commit, but it removed the initialization of the dpll_hw_state for HDMI outputs, resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating the dpll_hw_state initialization.
--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +16 -5
@@ -1694,21 +1694,32 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock,return bxt_ddi_set_dpll_hw_state (clock, &clk_div, dpll_hw_state); } +bool bxt_ddi_hdmi_set_dpll_hw_state (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state, +int clock, +struct intel_dpll_hw_state *dpll_hw_state) +{ +struct bxt_clk_div clk_div = { }; + +bxt_ddi_hdmi_pll_dividers (intel_crtc, crtc_state, clock, &clk_div); + +return bxt_ddi_set_dpll_hw_state (clock, &clk_div, dpll_hw_state); +} +static struct intel_shared_dpll *bxt_get_dpll (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { -struct bxt_clk_div clk_div = {0 }; -struct intel_dpll_hw_state dpll_hw_state = {0 }; +struct intel_dpll_hw_state dpll_hw_state = { };struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_digital_port *intel_dig_port;struct intel_shared_dpll *pll;int i, clock = crtc_state->port_clock; -if (encoder->type ==INTEL_OUTPUT_HDMI - && !bxt_ddi_hdmi_pll_dividers (crtc, crtc_state, - clock, &clk_div)) +if (encoder->type ==INTEL_OUTPUT_HDMI && + !bxt_ddi_hdmi_set_dpll_hw_state (crtc, crtc_state, clock, + &dpll_hw_state))return NULL ; if ((encoder->type == INTEL_OUTPUT_DP ||
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 7 lines · Imre Deak
a277ca7dc01dshould've been a no-functional-change commit, but it removed the initialization of thedpll_hw_statefor HDMI outputs, resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating thedpll_hw_stateinitialization.Fixes a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()")Signed-off-by Imre Deak <[email protected]>
Quoted 46 lines
--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_dpll_mgr.c +16
-5@@ -1694,21 +1694,32 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock,return bxt_ddi_set_dpll_hw_state (clock, &clk_div, dpll_hw_state); } +bool bxt_ddi_hdmi_set_dpll_hw_state (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state, +int clock, +struct intel_dpll_hw_state *dpll_hw_state) +{ +struct bxt_clk_div clk_div = { }; + +bxt_ddi_hdmi_pll_dividers (intel_crtc, crtc_state, clock, &clk_div); + +return bxt_ddi_set_dpll_hw_state (clock, &clk_div, dpll_hw_state); +} +static struct intel_shared_dpll *bxt_get_dpll (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { -struct bxt_clk_div clk_div = {0 }; -struct intel_dpll_hw_state dpll_hw_state = {0 }; +struct intel_dpll_hw_state dpll_hw_state = { };struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_digital_port *intel_dig_port;struct intel_shared_dpll *pll;int i, clock = crtc_state->port_clock; -if (encoder->type ==INTEL_OUTPUT_HDMI - && !bxt_ddi_hdmi_pll_dividers (crtc, crtc_state, - clock, &clk_div)) +if (encoder->type ==INTEL_OUTPUT_HDMI && + !bxt_ddi_hdmi_set_dpll_hw_state (crtc, crtc_state, clock, + &dpll_hw_state))return NULL ; if ((encoder->type == INTEL_OUTPUT_DP ||
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Jani Nikula
Quoted 5 lines · Imre Deak
a277ca7dc01dshould've been a no-functional-change commit, but it removed the initialization of thedpll_hw_statefor HDMI outputs, resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating thedpll_hw_stateinitialization.
Quoted 7 lines
Quoted 2 lines
Fixes a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()")Signed-off-by Imre Deak <[email protected]>Cc Manasi Navare <[email protected]>Cc Ander Conselvan de Oliveira <[email protected]>Cc Durgadoss R <[email protected]>Cc Rodrigo Vivi <[email protected]>
Aka pls update your dim copy, it'll generate this automatically. -Daniel
Quoted 54 lines
Quoted 47 lines
--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_dpll_mgr.c +16
-5@@ -1694,21 +1694,32 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock,return bxt_ddi_set_dpll_hw_state (clock, &clk_div, dpll_hw_state); } +bool bxt_ddi_hdmi_set_dpll_hw_state (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state, +int clock, +struct intel_dpll_hw_state *dpll_hw_state) +{ +struct bxt_clk_div clk_div = { }; + +bxt_ddi_hdmi_pll_dividers (intel_crtc, crtc_state, clock, &clk_div); + +return bxt_ddi_set_dpll_hw_state (clock, &clk_div, dpll_hw_state); +} +static struct intel_shared_dpll *bxt_get_dpll (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { -struct bxt_clk_div clk_div = {0 }; -struct intel_dpll_hw_state dpll_hw_state = {0 }; +struct intel_dpll_hw_state dpll_hw_state = { };struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_digital_port *intel_dig_port;struct intel_shared_dpll *pll;int i, clock = crtc_state->port_clock; -if (encoder->type ==INTEL_OUTPUT_HDMI - && !bxt_ddi_hdmi_pll_dividers (crtc, crtc_state, - clock, &clk_div)) +if (encoder->type ==INTEL_OUTPUT_HDMI && + !bxt_ddi_hdmi_set_dpll_hw_state (crtc, crtc_state, clock, + &dpll_hw_state))return NULL ; if ((encoder->type == INTEL_OUTPUT_DP ||Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://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] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/bxt: Fix HDMI DPLL configuration
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915/bxt: Fix HDMI DPLL configuration
URL : https://patchwork.freedesktop.org/series/12930/
State : failure
== Summary ==
Series 12930v1 drm/i915/bxt: Fix HDMI DPLL configuration
https://patchwork.freedesktop.org/api/1.0/series/12930/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-skl-6260u)fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 fi-byt-n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35 fi-hsw-4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-hsw-4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ilk-650 total:244 pass:177 dwarn:5 dfail:0 fail:2 skip:60 fi-ivb-3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37 fi-skl-6260u total:208 pass:195 dwarn:0 dfail:0 fail:0 skip:12 fi-skl-6700hq total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:22 fi-skl-6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:24 fi-skl-6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14 fi-snb-2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36 fi-snb-2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
Results at /archive/results/CI_IGT_test/Patchwork_2577/
aab15c274da587bcab19376d2caa9d6626440335 drm-intel-nightly: 2016y-09m-26d-12h-11m-33s UTC integration manifest 5b1abe9 drm/i915/bxt: Fix HDMI DPLL configuration
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915/bxt: Fix HDMI DPLL configuration
Quoted 12 lines · Patchwork
== Series Details ==
Series: drm/i915/bxt: Fix HDMI DPLL configuration URL : https://patchwork.freedesktop.org/series/12930/
State : failure== Summary ==
Series 12930v1 drm/i915/bxt: Fix HDMI DPLL configuration
https://patchwork.freedesktop.org/api/1.0/series/12930/revisions/1/mb
ox/
Quoted 11 lines
Test
kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
All the above are:
*ERROR* CPU pipe B FIFO underrun
*ERROR* PCH transcoder B FIFO underrun
Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=93310
Quoted 2 lines
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-skl-6260u)
Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=91703
Quoted 30 lines
fi-bdw-
5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-
n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 fi-byt-
n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35 fi-hsw-
4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-hsw-
4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ilk-
650 total:244 pass:177 dwarn:5 dfail:0 fail:2 skip:60 fi-ivb-
3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-
3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37 fi-skl-
6260u total:208 pass:195 dwarn:0 dfail:0 fail:0 skip:12 fi-skl-
6700hq total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:22 fi-skl-
6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:24 fi-skl-
6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14 fi-snb-
2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36 fi-snb-
2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
Quoted 6 lines
Results at /archive/results/CI_IGT_test/Patchwork_2577/
aab15c274da587bcab19376d2caa9d6626440335drm-intel-nightly: 2016y- 09m-26d-12h-11m-33s UTC integration manifest
5b1abe9 drm/i915/bxt: Fix HDMI DPLL configuration
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915/bxt: Fix HDMI DPLL configuration
Quoted 25 lines · Imre Deak
Quoted 12 lines · Patchwork
== Series Details ==
Series: drm/i915/bxt: Fix HDMI DPLL configuration URL : https://patchwork.freedesktop.org/series/12930/
State : failure== Summary ==
Series 12930v1 drm/i915/bxt: Fix HDMI DPLL configuration
https://patchwork.freedesktop.org/api/1.0/series/12930/revisions/1/mb
ox/Quoted 11 lines
Test
kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
Quoted 3 lines
All the above are:
*ERROR* CPU pipe B FIFO underrun
*ERROR* PCH transcoder B FIFO underrun
Hmm. All of those should have been fixed long ago. Did we have a regression? Except I'm not seeing any of these in the CI history. Weird.
Quoted 52 lines
Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=93310Quoted 2 lines
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-skl-6260u)Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=91703Quoted 30 lines
fi-bdw-
5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-
n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 fi-byt-
n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35 fi-hsw-
4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-hsw-
4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ilk-
650 total:244 pass:177 dwarn:5 dfail:0 fail:2 skip:60 fi-ivb-
3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-
3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37 fi-skl-
6260u total:208 pass:195 dwarn:0 dfail:0 fail:0 skip:12 fi-skl-
6700hq total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:22 fi-skl-
6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:24 fi-skl-
6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14 fi-snb-
2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36 fi-snb-
2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37Quoted 6 lines
Results at /archive/results/CI_IGT_test/Patchwork_2577/
aab15c274da587bcab19376d2caa9d6626440335drm-intel-nightly: 2016y- 09m-26d-12h-11m-33s UTC integration manifest
5b1abe9 drm/i915/bxt: Fix HDMI DPLL configuration_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915/bxt: Fix HDMI DPLL configuration
Quoted 27 lines · Ville Syrjälä
Quoted 26 lines · Imre Deak
Quoted 24 lines · Patchwork
== Series Details ==
Series: drm/i915/bxt: Fix HDMI DPLL configuration URL : https://patchwork.freedesktop.org/series/12930/
State : failure== Summary ==
Series 12930v1 drm/i915/bxt: Fix HDMI DPLL configuration
https://patchwork.freedesktop.org/api/1.0/series/12930/revisions/
1/mb
ox/Test
kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)
Quoted 6 lines
Quoted 3 lines
All the above are:
*ERROR* CPU pipe B FIFO underrun
*ERROR* PCH transcoder B FIFO underrunHmm. All of those should have been fixed long ago. Did we have a regression?
Not sure. It follows a
"Clock recovery check failed, cannot continue channel equalization", which AFAICS appeared recently, first in CI_DRM_1655. The error message itself isn't too old either though, it was added in CI_DRM_1626 ("drm/i915: Make DP link training channel equalization DP 1.2 Spec compliant").
Quoted 71 lines
Except I'm not seeing any of these in the CI history. Weird.
Quoted 67 lines
Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=93310Quoted 2 lines
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-skl-6260u)Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=91703Quoted 44 lines
fi-bdw-
5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:
15
fi-bsw-
n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:
42
fi-byt-
n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:
35
fi-hsw-
4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:
22
fi-hsw-
4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:
22
fi-ilk-
650 total:244 pass:177 dwarn:5 dfail:0 fail:2 skip:
60
fi-ivb-
3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:
25
fi-ivb-
3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:
37
fi-skl-
6260u total:208 pass:195 dwarn:0 dfail:0 fail:0 skip:
12
fi-skl-
6700hq total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:
22
fi-skl-
6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:
24
fi-skl-
6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:
14
fi-snb-
2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:
36
fi-snb-
2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:
37Quoted 7 lines
Results at /archive/results/CI_IGT_test/Patchwork_2577/
aab15c274da587bcab19376d2caa9d6626440335drm-intel-nightly:
2016y-
09m-26d-12h-11m-33s UTC integration manifest 5b1abe9 drm/i915/bxt: Fix HDMI DPLL configuration_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915/bxt: Fix HDMI DPLL configuration
Quoted 35 lines · Imre Deak
Quoted 27 lines · Ville Syrjälä
Quoted 26 lines · Imre Deak
Quoted 24 lines · Patchwork
== Series Details ==
Series: drm/i915/bxt: Fix HDMI DPLL configuration URL : https://patchwork.freedesktop.org/series/12930/
State : failure== Summary ==
Series 12930v1 drm/i915/bxt: Fix HDMI DPLL configuration
https://patchwork.freedesktop.org/api/1.0/series/12930/revisions/
1/mb
ox/Test
kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> DMESG-WARN (fi-ilk-650) Subgroup read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-ilk-650) Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-ilk-650)Quoted 6 lines
Quoted 3 lines
All the above are:
*ERROR* CPU pipe B FIFO underrun
*ERROR* PCH transcoder B FIFO underrunHmm. All of those should have been fixed long ago. Did we have a regression?
Quoted 6 lines
Not sure. It follows a
"Clock recovery check failed, cannot continue channel equalization", which AFAICS appeared recently, first inCI_DRM_1655. The error message itself isn't too old either though, it was added inCI_DRM_1626("drm/i915: Make DP link training channel equalization DP 1.2 Spec compliant").
Ah. More importantly it follows
[ 439.107783] [drm:intel_dp_check_link_status] DP C: channel EQ not ok, retraining'
which does generate underruns in my experience. I suppose we should just suppress them.
Quoted 72 lines
Quoted 72 lines
Except I'm not seeing any of these in the CI history. Weird.
Quoted 67 lines
Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=93310Quoted 2 lines
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-skl-6260u)Unrelated platform:
https://bugs.freedesktop.org/show_bug.cgi?id=91703Quoted 44 lines
fi-bdw-
5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:
15
fi-bsw-
n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:
42
fi-byt-
n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:
35
fi-hsw-
4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:
22
fi-hsw-
4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:
22
fi-ilk-
650 total:244 pass:177 dwarn:5 dfail:0 fail:2 skip:
60
fi-ivb-
3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:
25
fi-ivb-
3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:
37
fi-skl-
6260u total:208 pass:195 dwarn:0 dfail:0 fail:0 skip:
12
fi-skl-
6700hq total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:
22
fi-skl-
6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:
24
fi-skl-
6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:
14
fi-snb-
2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:
36
fi-snb-
2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:
37Quoted 7 lines
Results at /archive/results/CI_IGT_test/Patchwork_2577/
aab15c274da587bcab19376d2caa9d6626440335drm-intel-nightly:
2016y-
09m-26d-12h-11m-33s UTC integration manifest 5b1abe9 drm/i915/bxt: Fix HDMI DPLL configuration_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 46 lines · Imre Deak
a277ca7dc01dshould've been a no-functional-change commit, but it removed the initialization of thedpll_hw_statefor HDMI outputs, resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating thedpll_hw_stateinitialization.Fixes a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()")Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++++++++++++++++-----1 file changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_dpll_mgr.c +0
-0@@ -1694,21 +1694,32 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock, return bxt_ddi_set_dpll_hw_state(clock, &clk_div, dpll_hw_state); }drivers/gpu/drm/i915/intel_dpll_mgr.c +4
-0+bool bxt_ddi_hdmi_set_dpll_hw_state (struct intel_crtc *intel_crtc, + struct intel_crtc_state *crtc_state, + int clock, + struct intel_dpll_hw_state
*dpll_hw_state)drivers/gpu/drm/i915/intel_dpll_mgr.c +8
-0+{ +struct bxt_clk_div clk_div = { }; + +bxt_ddi_hdmi_pll_dividers (intel_crtc, crtc_state, clock, &clk_div); + +return bxt_ddi_set_dpll_hw_state (clock, &clk_div, dpll_hw_state); +} +static struct
intel_shared_dpll*bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, struct intel_encoder *encoder){drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-2-struct bxt_clk_div clk_div = {0 }; -struct intel_dpll_hw_state dpll_hw_state = {0 }; +struct intel_dpll_hw_state dpll_hw_state = { };struct
drm_i915_private*dev_priv=to_i915(crtc->base.dev); structintel_digital_port*intel_dig_port;
structintel_shared_dpll*pll;
int i, clock =crtc_state->port_clock;
drivers/gpu/drm/i915/intel_dpll_mgr.c bool bxt_ddi_dp_set_dpll_hw_state(int clock, · line 1722
Quoted 6 lines
drivers/gpu/drm/i915/intel_dpll_mgr.c +3
-3-if (encoder->type ==INTEL_OUTPUT_HDMI - && !bxt_ddi_hdmi_pll_dividers(crtc, crtc_state, - clock, &clk_div)) +if (encoder->type ==INTEL_OUTPUT_HDMI && + !bxt_ddi_hdmi_set_dpll_hw_state(crtc, crtc_state, clock, + &dpll_hw_state))
In my original patch there was just a straight call
to bxt_ddi_set_dpll_hw_state() after this and the DP if condition (which also only calculated dividers). But whatever fixes the issue:
Quoted 3 lines
return NULL;
if ((encoder->type==INTEL_OUTPUT_DP||
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Imre Deak
AppliedQuoted 49 lines · Ander Conselvan De Oliveira
Quoted 48 lines · Imre Deak
a277ca7dc01dshould've been a no-functional-change commit, but it removed the initialization of thedpll_hw_statefor HDMI outputs, resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating thedpll_hw_stateinitialization.Fixes a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()")Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++++++++++++++++-----1 file changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_dpll_mgr.c +0
-0@@ -1694,21 +1694,32 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock, return bxt_ddi_set_dpll_hw_state(clock, &clk_div, dpll_hw_state); }drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+bool bxt_ddi_hdmi_set_dpll_hw_state (struct intel_crtc *intel_crtc, + struct intel_crtc_state
*crtc_state,drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+ int clock, + struct intel_dpll_hw_state
*dpll_hw_state)drivers/gpu/drm/i915/intel_dpll_mgr.c +4
-0+{ +struct bxt_clk_div clk_div = { }; + + bxt_ddi_hdmi_pll_dividers(intel_crtc, crtc_state, clock,
&clk_div);drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+ + return bxt_ddi_set_dpll_hw_state(clock, &clk_div,
dpll_hw_state);drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+} +static struct
intel_shared_dpll*bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, struct intel_encoder *encoder){drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-2-struct bxt_clk_div clk_div = {0 }; -struct intel_dpll_hw_state dpll_hw_state = {0 }; +struct intel_dpll_hw_state dpll_hw_state = { };struct
drm_i915_private*dev_priv= to_i915(crtc-Quoted 1 line
base.dev);
Quoted 15 lines
drivers/gpu/drm/i915/intel_dpll_mgr.c bool bxt_ddi_dp_set_dpll_hw_state(int clock, · line 1722
Quoted 11 lines
struct
intel_digital_port*intel_dig_port; structintel_shared_dpll*pll;
int i, clock =crtc_state->port_clock;drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-3-if (encoder->type ==INTEL_OUTPUT_HDMI - && !bxt_ddi_hdmi_pll_dividers(crtc, crtc_state, - clock, &clk_div)) +if (encoder->type ==INTEL_OUTPUT_HDMI && + !bxt_ddi_hdmi_set_dpll_hw_state(crtc, crtc_state,clock,
drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-0+ &dpll_hw_state))In my original patch there was just a straight call
to bxt_ddi_set_dpll_hw_state() after this and the DP if condition (which also only calculated dividers).
That would require exporting bxt_ddi_dp_pll_dividers(), so I just left it as-is. I forgot to make bxt_ddi_hdmi_set_dpll_hw_state() static, I fixed that up while applying.
Pushed to -dinq, thanks for the review.
Quoted 7 lines
But whatever fixes the issue:
Reviewed-by Ander Conselvan de Oliveira <[email protected]>Quoted 3 lines
return NULL;
if ((encoder->type==INTEL_OUTPUT_DP||
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 67 lines · Imre Deak
Quoted 52 lines · Ander Conselvan De Oliveira
Quoted 50 lines · Imre Deak
a277ca7dc01dshould've been a no-functional-change commit, but it removed the initialization of thedpll_hw_statefor HDMI outputs, resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating thedpll_hw_stateinitialization.Fixes a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()")Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++++++++++++++++-----1 file changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_dpll_mgr.c +0
-0@@ -1694,21 +1694,32 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock, return bxt_ddi_set_dpll_hw_state(clock, &clk_div, dpll_hw_state); }drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+bool bxt_ddi_hdmi_set_dpll_hw_state (struct intel_crtc *intel_crtc, + struct intel_crtc_state
*crtc_state,drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+ int clock, + struct intel_dpll_hw_state
*dpll_hw_state)drivers/gpu/drm/i915/intel_dpll_mgr.c +4
-0+{ +struct bxt_clk_div clk_div = { }; + + bxt_ddi_hdmi_pll_dividers(intel_crtc, crtc_state, clock,
&clk_div);drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+ + return bxt_ddi_set_dpll_hw_state(clock, &clk_div,
dpll_hw_state);drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+} +static struct
intel_shared_dpll*bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, struct intel_encoder *encoder){drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-2-struct bxt_clk_div clk_div = {0 }; -struct intel_dpll_hw_state dpll_hw_state = {0 }; +struct intel_dpll_hw_state dpll_hw_state = { };struct
drm_i915_private*dev_priv= to_i915(crtc-Quoted 2 lines
base.dev);
Quoted 14 lines
drivers/gpu/drm/i915/intel_dpll_mgr.c bool bxt_ddi_dp_set_dpll_hw_state(int clock, · line 1722
Quoted 11 lines
struct
intel_digital_port*intel_dig_port; structintel_shared_dpll*pll;
int i, clock =crtc_state->port_clock;drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-3-if (encoder->type ==INTEL_OUTPUT_HDMI - && !bxt_ddi_hdmi_pll_dividers(crtc, crtc_state, - clock, &clk_div)) +if (encoder->type ==INTEL_OUTPUT_HDMI && + !bxt_ddi_hdmi_set_dpll_hw_state(crtc, crtc_state,clock,
drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-0+ &dpll_hw_state))In my original patch there was just a straight call
to bxt_ddi_set_dpll_hw_state() after this and the DP if condition (which also only calculated dividers).
Quoted 2 lines
That would require exporting
bxt_ddi_dp_pll_dividers(), so I just left it as-is.
Not necessarily, bxt_ddi_dp_set_dpll_hw_state() could still be exported for the caller. But the current solution is fine.
An even better solution would be to have a somewhat platform independent entry point for force enabling a DPLL independent of modeset with a given clock for DP. The caller of bxt_ddi_dp_set_dpll_hw_state() will immediately enable the DPLL anyway, so it could instead just ask the DPLL code to do the right thing and enable the PLL and leave as much of the platform specific part out of the caller.
Ander
Quoted 14 lines
I forgot to make bxt_ddi_hdmi_set_dpll_hw_state() static, I
fixed that up while applying.Pushed to -dinq, thanks for the review.
Quoted 9 lines
But whatever fixes the issue:
Reviewed-by Ander Conselvan de Oliveira <[email protected]>Quoted 4 lines
return NULL;
if ((encoder->type==INTEL_OUTPUT_DP||
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 75 lines · Ander Conselvan De Oliveira
Quoted 74 lines · Imre Deak
Quoted 72 lines · Ander Conselvan De Oliveira
Quoted 66 lines · Imre Deak
a277ca7dc01dshould've been a no-functional-change commit, but it
removed the initialization of thedpll_hw_statefor HDMI outputs,
resulting in state mismatches and a failed modeset with blank screen. Fix this by reinstating thedpll_hw_stateinitialization.Fixes a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()")Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++++++++++++++++--- --1 file changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_dpll_mgr.c +0
-0@@ -1694,21 +1694,32 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock, return bxt_ddi_set_dpll_hw_state(clock, &clk_div, dpll_hw_state); }
+bool bxt_ddi_hdmi_set_dpll_hw_state(structintel_crtc*intel_crtc,drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-0+ struct intel_crtc_state
*crtc_state,drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+ int clock, + struct intel_dpll_hw_state
*dpll_hw_state)drivers/gpu/drm/i915/intel_dpll_mgr.c +4
-0+{ +struct bxt_clk_div clk_div = { }; + + bxt_ddi_hdmi_pll_dividers(intel_crtc, crtc_state,clock,
&clk_div);drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+ + return bxt_ddi_set_dpll_hw_state(clock, &clk_div,
dpll_hw_state);drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-0+} +static struct
intel_shared_dpll*bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, struct intel_encoder *encoder){drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-2-struct bxt_clk_div clk_div = {0 }; -struct intel_dpll_hw_state dpll_hw_state = {0 }; +struct intel_dpll_hw_state dpll_hw_state = { };struct
drm_i915_private*dev_priv= to_i915(crtc-Quoted 2 lines
base.dev);
struct
intel_digital_port*intel_dig_port; structintel_shared_dpll*pll;
int i, clock =crtc_state->port_clock;drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-3-if (encoder->type ==INTEL_OUTPUT_HDMI - && !bxt_ddi_hdmi_pll_dividers(crtc, crtc_state, - clock, &clk_div)) +if (encoder->type ==INTEL_OUTPUT_HDMI && + !bxt_ddi_hdmi_set_dpll_hw_state(crtc, crtc_state,clock,
drivers/gpu/drm/i915/intel_dpll_mgr.c bool bxt_ddi_dp_set_dpll_hw_state(int clock, · line 1722
Quoted 1 line
drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-0+ &dpll_hw_state))In my original patch there was just a straight call
to bxt_ddi_set_dpll_hw_state() after this and the DP if condition (which also only calculated dividers).
Quoted 7 lines
Quoted 3 lines
That would require exporting
bxt_ddi_dp_pll_dividers(), so I just left
it as-is.Not necessarily,
bxt_ddi_dp_set_dpll_hw_state()could still be exported for the
caller.
Ok, that would've worked. I was thinking along having the same calls from intel_ddi_get_link_dpll() and bxt_get_dpll() for DPLL setup to keep things more unified.
Quoted 13 lines
But the current solution is fine.
An even better solution would be to have a somewhat platform independent entry
point for force enabling a DPLL independent of modeset with a given clock for
DP. The caller ofbxt_ddi_dp_set_dpll_hw_state()will immediately enable the
DPLL anyway, so it could instead just ask the DPLL code to do the right thing
and enable the PLL and leave as much of the platform specific part out of the
caller.
There is no user yet for intel_ddi_get_link_dpll(), but having a platform independent way to turn DPLLs on/off makes sense to me.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx