Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
Subsystems (3)
PATCH 1/1 Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
The problem the reverted patch revealed could've been fixed by commit 619ad4874585 ("drm/i915/ddi: Don't frob the DP link scramble disabling flag") in particular because the revealed problem (at least in one case) happened when switching to the TPS4 training pattern, which needs scrambling.
Let's try applying the HBR3 fix again.
This reverts commit d3913019602e32ef6fbba8eb0167e83250cdab22.
--- drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +11 -17
@@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4};* * If a CPU or PCH DP output is attached to an eDP panel, this function * will return true, and false otherwise. +* +* This function is not safe to use prior to encoder type being set. */ bool intel_dp_is_edp (struct intel_dp *intel_dp) {
@@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, intel_encoder->base.name))return false; -intel_dp_set_source_rates (intel_dp); - intel_dp->reset_link_params = true; intel_dp->pps_pipe =INVALID_PIPE ; intel_dp->active_pipe =INVALID_PIPE ;
@@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,*/ drm_WARN_ON (dev,intel_phy_is_tc (dev_priv, phy)); type = DRM_MODE_CONNECTOR_eDP; + intel_encoder->type =INTEL_OUTPUT_EDP ; + +/* eDP only on port B and/or C on vlv/chv */ +if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) && + port !=PORT_B && port !=PORT_C )) +return false; }else { type = DRM_MODE_CONNECTOR_DisplayPort; } +intel_dp_set_source_rates (intel_dp); +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) intel_dp->active_pipe =vlv_active_pipe (intel_dp); -/* -* For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but -* for DP the encoder type can be set by the caller to -* INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. -*/ -if (type == DRM_MODE_CONNECTOR_eDP) - intel_encoder->type =INTEL_OUTPUT_EDP ; - -/* eDP only on port B and/or C on vlv/chv */ -if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || -IS_CHERRYVIEW (dev_priv)) && -intel_dp_is_edp (intel_dp) && - port !=PORT_B && port !=PORT_C )) -return false; - drm_dbg_kms(&dev_priv->drm, "Adding %s connector on [ENCODER:%d:%s]\n", type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",
Signature · 6 lines
2.23.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
== Series Details ==
== Series Details ==
Series: Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
URL : https://patchwork.freedesktop.org/series/79522/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
16afab03b437 Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
-:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#11:
619ad4874585 ("drm/i915/ddi: Don't frob the DP link scramble disabling flag")total: 0 errors, 1 warnings, 0 checks, 53 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
URL : https://patchwork.freedesktop.org/series/79522/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.0 Fast mode used, each commit won't be checked separately.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
URL : https://patchwork.freedesktop.org/series/79522/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8751 -> Patchwork_18181
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/index.html
Known issues
------------
Here are the changes found in Patchwork_18181 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-tgl-u2: [PASS][1] -> [FAIL][2] ([i915#1888]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-tgl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-tgl-u2/igt@[email protected]
* igt@i915_module_load@reload:
- fi-byt-j1900: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-byt-j1900/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-byt-j1900/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-tgl-y: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-tgl-y/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-tgl-y/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-n3050: [PASS][7] -> [DMESG-WARN][8] ([i915#1982])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-bsw-n3050/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-bsw-n3050/igt@[email protected]
* igt@vgem_basic@setversion:
- fi-tgl-y: [PASS][9] -> [DMESG-WARN][10] ([i915#402]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-tgl-y/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [DMESG-WARN][11] ([i915#1982]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-bsw-kefka/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-bsw-kefka/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-tgl-y: [DMESG-WARN][13] ([i915#1982]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-tgl-y/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-tgl-y/igt@[email protected]
* igt@vgem_basic@dmabuf-export:
- fi-tgl-y: [DMESG-WARN][15] ([i915#402]) -> [PASS][16] +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-tgl-y/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-x1275: [DMESG-WARN][17] ([i915#1982] / [i915#62] / [i915#92]) -> [DMESG-WARN][18] ([i915#62] / [i915#92] / [i915#95])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-kbl-x1275/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-kbl-x1275/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [SKIP][19] ([fdo#109271]) -> [DMESG-FAIL][20] ([i915#62] / [i915#95])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-kbl-x1275/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-kbl-x1275/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-kbl-x1275: [DMESG-WARN][21] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][22] ([i915#62] / [i915#92]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-kbl-x1275/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-kbl-x1275/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-kbl-x1275: [DMESG-WARN][23] ([i915#62] / [i915#92]) -> [DMESG-WARN][24] ([i915#62] / [i915#92] / [i915#95]) +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/fi-kbl-x1275/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-kbl-x1275/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (47 -> 40)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_8751 -> Patchwork_18181
CI-20190529: 20190529
CI_DRM_8751: 5c4e78b5b9bac486fa56fb3305a789e61164a497 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5735: 21f8204e54c122e4a0f8ca4b59e4b2db8d1ba687 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18181: 16afab03b43751c8972aa88f88bbec6df1244009 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
16afab03b437 Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Imre Deak
The problem the reverted patch revealed could've been fixed by commit
619ad4874585("drm/i915/ddi: Don't frob the DP link scramble disabling flag") in particular because the revealed problem (at least in one case) happened when switching to the TPS4 training pattern, which needs scrambling.Let's try applying the HBR3 fix again.
Quoted 7 lines
This reverts commit
d3913019602e32ef6fbba8eb0167e83250cdab22.Cc Matt Atwood <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Manasi Navare <[email protected]>Cc José Roberto de Souza <[email protected]>Signed-off-by Imre Deak <[email protected]>
Makes sense since the problem occured only in CI, not on the local testing done by Matt on his eDP panel.
Manasi
Quoted 67 lines
--- drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +11
-17@@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4};* * If a CPU or PCH DP output is attached to an eDP panel, this function * will return true, and false otherwise. +* +* This function is not safe to use prior to encoder type being set. */ bool intel_dp_is_edp (struct intel_dp *intel_dp) {@@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, intel_encoder->base.name))return false; -intel_dp_set_source_rates (intel_dp); - intel_dp->reset_link_params = true; intel_dp->pps_pipe =INVALID_PIPE ; intel_dp->active_pipe =INVALID_PIPE ;@@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,*/ drm_WARN_ON (dev,intel_phy_is_tc (dev_priv, phy)); type = DRM_MODE_CONNECTOR_eDP; + intel_encoder->type =INTEL_OUTPUT_EDP ; + +/* eDP only on port B and/or C on vlv/chv */ +if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) && + port !=PORT_B && port !=PORT_C )) +return false; }else { type = DRM_MODE_CONNECTOR_DisplayPort; } +intel_dp_set_source_rates (intel_dp); +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) intel_dp->active_pipe =vlv_active_pipe (intel_dp); -/* -* For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but -* for DP the encoder type can be set by the caller to -* INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. -*/ -if (type == DRM_MODE_CONNECTOR_eDP) - intel_encoder->type =INTEL_OUTPUT_EDP ; - -/* eDP only on port B and/or C on vlv/chv */ -if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || -IS_CHERRYVIEW (dev_priv)) && -intel_dp_is_edp (intel_dp) && - port !=PORT_B && port !=PORT_C )) -return false; - drm_dbg_kms(&dev_priv->drm, "Adding %s connector on [ENCODER:%d:%s]\n", type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",Signature · 1 line
2.23.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Manasi Navare
Quoted 6 lines · Imre Deak
The problem the reverted patch revealed could've been fixed by commit
619ad4874585("drm/i915/ddi: Don't frob the DP link scramble disabling flag") in particular because the revealed problem (at least in one case) happened when switching to the TPS4 training pattern, which needs scrambling.Let's try applying the HBR3 fix again.
The link training failure still happens the same way on fi-icl-u2.
Quoted 75 lines
Quoted 8 lines
This reverts commit
d3913019602e32ef6fbba8eb0167e83250cdab22.Cc Matt Atwood <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Manasi Navare <[email protected]>Cc José Roberto de Souza <[email protected]>Signed-off-by Imre Deak <[email protected]>Makes sense since the problem occured only in CI, not on the local testing done by Matt on his eDP panel.
Reviewed-by Manasi Navare <[email protected]>Manasi
Quoted 59 lines
--- drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +11
-15@@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4};* * If a CPU or PCH DP output is attached to an eDP panel, this function * will return true, and false otherwise. +* +* This function is not safe to use prior to encoder type being set. */ bool intel_dp_is_edp (struct intel_dp *intel_dp) {@@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, intel_encoder->base.name))return false; -intel_dp_set_source_rates (intel_dp); - intel_dp->reset_link_params = true; intel_dp->pps_pipe =INVALID_PIPE ; intel_dp->active_pipe =INVALID_PIPE ;@@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,*/ drm_WARN_ON (dev,intel_phy_is_tc (dev_priv, phy)); type = DRM_MODE_CONNECTOR_eDP; + intel_encoder->type =INTEL_OUTPUT_EDP ; + +/* eDP only on port B and/or C on vlv/chv */ +if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) && + port !=PORT_B && port !=PORT_C )) +return false; }else { type = DRM_MODE_CONNECTOR_DisplayPort; } +intel_dp_set_source_rates (intel_dp); +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) intel_dp->active_pipe =vlv_active_pipe (intel_dp); -/* -* For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but -* for DP the encoder type can be set by the caller to -* INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. -*/ -if (type == DRM_MODE_CONNECTOR_eDP) - intel_encoder->type =INTEL_OUTPUT_EDP ; - -/* eDP only on port B and/or C on vlv/chv */ -if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || -IS_CHERRYVIEW (dev_priv)) && -intel_dp_is_edp (intel_dp) && - port !=PORT_B && port !=PORT_C ))
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp.c +0
-2-return false; - drm_dbg_kms(&dev_priv->drm, "Adding %s connector on [ENCODER:%d:%s]\n", type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",Signature · 1 line
2.23.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Imre Deak
Quoted 7 lines · Manasi Navare
Quoted 6 lines · Imre Deak
The problem the reverted patch revealed could've been fixed by commit
619ad4874585("drm/i915/ddi: Don't frob the DP link scramble disabling flag") in particular because the revealed problem (at least in one case) happened when switching to the TPS4 training pattern, which needs scrambling.Let's try applying the HBR3 fix again.
The link training failure still happens the same way on fi-icl-u2.
Previously this only failed on a specific TGL CI system, did you get failures on both this go around? ICL passed last time.
Quoted 76 lines
Quoted 76 lines
Quoted 9 lines
This reverts commit
d3913019602e32ef6fbba8eb0167e83250cdab22.Cc Matt Atwood <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Manasi Navare <[email protected]>Cc José Roberto de Souza <[email protected]>Signed-off-by Imre Deak <[email protected]>Makes sense since the problem occured only in CI, not on the local testing done by Matt on his eDP panel.
Reviewed-by Manasi Navare <[email protected]>Manasi
Quoted 59 lines
--- drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +11
-15@@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4};* * If a CPU or PCH DP output is attached to an eDP panel, this function * will return true, and false otherwise. +* +* This function is not safe to use prior to encoder type being set. */ bool intel_dp_is_edp (struct intel_dp *intel_dp) {@@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, intel_encoder->base.name))return false; -intel_dp_set_source_rates (intel_dp); - intel_dp->reset_link_params = true; intel_dp->pps_pipe =INVALID_PIPE ; intel_dp->active_pipe =INVALID_PIPE ;@@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,*/ drm_WARN_ON (dev,intel_phy_is_tc (dev_priv, phy)); type = DRM_MODE_CONNECTOR_eDP; + intel_encoder->type =INTEL_OUTPUT_EDP ; + +/* eDP only on port B and/or C on vlv/chv */ +if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) && + port !=PORT_B && port !=PORT_C )) +return false; }else { type = DRM_MODE_CONNECTOR_DisplayPort; } +intel_dp_set_source_rates (intel_dp); +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) intel_dp->active_pipe =vlv_active_pipe (intel_dp); -/* -* For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but -* for DP the encoder type can be set by the caller to -* INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. -*/ -if (type == DRM_MODE_CONNECTOR_eDP) - intel_encoder->type =INTEL_OUTPUT_EDP ; - -/* eDP only on port B and/or C on vlv/chv */ -if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || -IS_CHERRYVIEW (dev_priv)) && -intel_dp_is_edp (intel_dp) && - port !=PORT_B && port !=PORT_C ))
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp.c +0
-2-return false; - drm_dbg_kms(&dev_priv->drm, "Adding %s connector on [ENCODER:%d:%s]\n", type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",Signature · 1 line
2.23.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Matt Atwood
Quoted 7 lines · Imre Deak
Quoted 6 lines · Manasi Navare
Quoted 5 lines · Imre Deak
The problem the reverted patch revealed could've been fixed by commit
619ad4874585("drm/i915/ddi: Don't frob the DP link scramble disabling flag") in particular because the revealed problem (at least in one case) happened when switching to the TPS4 training pattern, which needs scrambling.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Let's try applying the HBR3 fix again.
The link training failure still happens the same way on fi-icl-u2.
Previously this only failed on a specific TGL CI system, did you get failures on both this go around? ICL passed last time.
Arg, it's fi-tgl-u2, sorry for the mixup. For instance:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/fi-tgl-u2/dmesg0.txt
https://patchwork.freedesktop.org/series/79486/ would be another thing to try.
Quoted 76 lines
Quoted 76 lines
Quoted 76 lines
Quoted 9 lines
This reverts commit
d3913019602e32ef6fbba8eb0167e83250cdab22.Cc Matt Atwood <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Manasi Navare <[email protected]>Cc José Roberto de Souza <[email protected]>Signed-off-by Imre Deak <[email protected]>Makes sense since the problem occured only in CI, not on the local testing done by Matt on his eDP panel.
Reviewed-by Manasi Navare <[email protected]>Manasi
Quoted 59 lines
--- drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +11
-15@@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4};* * If a CPU or PCH DP output is attached to an eDP panel, this function * will return true, and false otherwise. +* +* This function is not safe to use prior to encoder type being set. */ bool intel_dp_is_edp (struct intel_dp *intel_dp) {@@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, intel_encoder->base.name))return false; -intel_dp_set_source_rates (intel_dp); - intel_dp->reset_link_params = true; intel_dp->pps_pipe =INVALID_PIPE ; intel_dp->active_pipe =INVALID_PIPE ;@@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,*/ drm_WARN_ON (dev,intel_phy_is_tc (dev_priv, phy)); type = DRM_MODE_CONNECTOR_eDP; + intel_encoder->type =INTEL_OUTPUT_EDP ; + +/* eDP only on port B and/or C on vlv/chv */ +if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) && + port !=PORT_B && port !=PORT_C )) +return false; }else { type = DRM_MODE_CONNECTOR_DisplayPort; } +intel_dp_set_source_rates (intel_dp); +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) intel_dp->active_pipe =vlv_active_pipe (intel_dp); -/* -* For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but -* for DP the encoder type can be set by the caller to -* INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. -*/ -if (type == DRM_MODE_CONNECTOR_eDP) - intel_encoder->type =INTEL_OUTPUT_EDP ; - -/* eDP only on port B and/or C on vlv/chv */ -if (drm_WARN_ON (dev, (IS_VALLEYVIEW (dev_priv) || -IS_CHERRYVIEW (dev_priv)) && -intel_dp_is_edp (intel_dp) && - port !=PORT_B && port !=PORT_C ))
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp.c +0
-2-return false; - drm_dbg_kms(&dev_priv->drm, "Adding %s connector on [ENCODER:%d:%s]\n", type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",Signature · 1 line
2.23.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: Revert "Revert "drm/i915/dp: Correctly advertise HBR3 for GEN11+""
URL : https://patchwork.freedesktop.org/series/79522/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8751_full -> Patchwork_18181_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_18181_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_balancer@bonded-early:
- shard-iclb: [PASS][1] -> [FAIL][2] ([i915#926])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-iclb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-iclb2/igt@[email protected]
* igt@gem_exec_fence@parallel@vcs0:
- shard-glk: [PASS][3] -> [DMESG-WARN][4] ([i915#118] / [i915#95]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-glk5/igt@gem_exec_fence@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-glk3/igt@gem_exec_fence@[email protected]
* igt@i915_pm_rpm@system-suspend-execbuf:
- shard-tglb: [PASS][5] -> [DMESG-WARN][6] ([i915#402])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-tglb2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-tglb5/igt@[email protected]
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([i915#151] / [i915#69])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl10/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl2/igt@[email protected]
* igt@i915_selftest@live@execlists:
- shard-apl: [PASS][9] -> [INCOMPLETE][10] ([i915#1635])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-apl8/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-apl7/igt@i915_selftest@[email protected]
* igt@kms_big_fb@linear-64bpp-rotate-0:
- shard-glk: [PASS][11] -> [DMESG-FAIL][12] ([i915#118] / [i915#95])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-glk3/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-glk8/igt@[email protected]
* igt@kms_flip@basic-plain-flip@a-edp1:
- shard-skl: [PASS][13] -> [DMESG-WARN][14] ([i915#1982]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl9/igt@kms_flip@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl7/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@c-edp1:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#79])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl10/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl8/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- shard-iclb: [PASS][17] -> [FAIL][18] ([i915#49]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-iclb2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-iclb4/igt@[email protected]
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-iclb: [PASS][19] -> [FAIL][20] ([i915#247])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-iclb2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-iclb4/igt@[email protected]
* igt@kms_psr@psr2_dpms:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-iclb2/igt@kms_psr@psr2_dpms.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-iclb3/igt@kms_psr@psr2_dpms.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [PASS][23] -> [DMESG-WARN][24] ([i915#180]) +6 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-kbl2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-kbl7/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_persistence@legacy-engines-mixed-process@vebox:
- shard-skl: [FAIL][25] ([i915#1528]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl5/igt@gem_ctx_persistence@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl4/igt@gem_ctx_persistence@[email protected]
* igt@gem_exec_whisper@basic-contexts-priority-all:
- shard-glk: [DMESG-WARN][27] ([i915#118] / [i915#95]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-glk3/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-glk8/igt@[email protected]
* igt@kms_color@pipe-c-ctm-0-25:
- shard-skl: [DMESG-WARN][29] ([i915#1982]) -> [PASS][30] +10 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl2/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][31] ([i915#180]) -> [PASS][32] +9 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-kbl7/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-kbl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding:
- shard-skl: [FAIL][33] ([i915#54]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl8/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [INCOMPLETE][35] ([i915#300]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl6/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl10/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [INCOMPLETE][37] ([i915#155]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-kbl2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-kbl7/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-ytiled:
- shard-glk: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-glk4/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-glk7/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [FAIL][41] ([i915#79]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl10/igt@kms_flip@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl8/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-msflip-blt:
- shard-tglb: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-tglb5/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-tglb3/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][45] ([i915#1188]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl7/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][47] ([fdo#108145] / [i915#265]) -> [PASS][48] +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl2/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl3/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-iclb1/igt@kms_psr@psr2_cursor_mmap_cpu.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][51] ([i915#1635] / [i915#31]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-apl4/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-apl4/igt@[email protected]
- shard-kbl: [FAIL][53] ([i915#31]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-kbl3/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-kbl6/igt@[email protected]
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][55] ([i915#69]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-skl4/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-skl9/igt@[email protected]
* igt@perf@blocking-parameterized:
- shard-iclb: [FAIL][57] ([i915#1542]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-iclb5/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-iclb1/igt@[email protected]
* igt@perf_pmu@module-unload:
- shard-iclb: [DMESG-WARN][59] ([i915#1982]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-iclb8/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-iclb7/igt@[email protected]
#### Warnings ####
* igt@gen9_exec_parse@bb-start-far:
- shard-snb: [TIMEOUT][61] ([i915#1958] / [i915#2119]) -> [INCOMPLETE][62] ([i915#82])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-snb4/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-snb1/igt@[email protected]
* igt@kms_content_protection@atomic-dpms:
- shard-kbl: [TIMEOUT][63] ([i915#1319] / [i915#2119]) -> [TIMEOUT][64] ([i915#1319] / [i915#1958] / [i915#2119])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-kbl4/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-kbl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-apl: [DMESG-FAIL][65] ([fdo#108145] / [i915#1635] / [i915#1982]) -> [FAIL][66] ([fdo#108145] / [i915#1635] / [i915#265])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8751/shard-apl1/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/shard-apl2/igt@[email protected]
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#151]: https://gitlab.freedesktop.org/drm/intel/issues/151
[i915#1528]: https://gitlab.freedesktop.org/drm/intel/issues/1528
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2119]: https://gitlab.freedesktop.org/drm/intel/issues/2119
[i915#247]: https://gitlab.freedesktop.org/drm/intel/issues/247
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#926]: https://gitlab.freedesktop.org/drm/intel/issues/926
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_8751 -> Patchwork_18181
CI-20190529: 20190529
CI_DRM_8751: 5c4e78b5b9bac486fa56fb3305a789e61164a497 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5735: 21f8204e54c122e4a0f8ca4b59e4b2db8d1ba687 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18181: 16afab03b43751c8972aa88f88bbec6df1244009 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18181/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx