Revert "drm/i915: Force state->modeset=true when distrust_bios_wm==true"
Subsystems (3)
PATCH 1/1 Revert "drm/i915: Force state->modeset=true when distrust_bios_wm==true"
The fix of flagging state->modeset whenever distrust_bios_wm is set causes a regression when initializing display(s) attached to a Lenovo USB-C docking station. The display remains blank until the dock is reattached. Revert to bring the behavior of the functional v5.6 stable.
This reverts commit 0f8839f5f323da04a800e6ced1136e4b1e1689a9.
--- drivers/gpu/drm/i915/display/intel_display.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -14
@@ -14942,20 +14942,6 @@ static int intel_atomic_check(struct drm_device *dev,if (ret) goto fail; -/* -* distrust_bios_wm will force a full dbuf recomputation -* but the hardware state will only get updated accordingly -* if state->modeset==true. Hence distrust_bios_wm==true && -* state->modeset==false is an invalid combination which -* would cause the hardware and software dbuf state to get -* out of sync. We must prevent that. -* -* FIXME clean up this mess and introduce better -* state tracking for dbuf. -*/ -if (dev_priv->wm.distrust_bios_wm) - any_ms = true; -intel_fbc_choose_crtc (dev_priv, state); ret =calc_watermark_data (state);if (ret)
Signature · 1 line
2.25.4
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Revert "drm/i915: Force state->modeset=true when distrust_bios_wm==true"
== Series Details ==
== Series Details ==
Series: Revert "drm/i915: Force state->modeset=true when distrust_bios_wm==true"
URL : https://patchwork.freedesktop.org/series/82261/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9078 -> Patchwork_18597
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18597 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18597, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18597:
### IGT changes ###
#### Possible regressions ####
* igt@kms_chamelium@dp-edid-read:
- fi-icl-u2: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-icl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-icl-u2/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18597 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-byt-j1900: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-byt-j1900/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-byt-j1900/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-apl-guc: [PASS][5] -> [DMESG-WARN][6] ([i915#1635] / [i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-apl-guc/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-apl-guc/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [PASS][7] -> [DMESG-WARN][8] ([i915#1982]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-icl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- {fi-kbl-7560u}: [INCOMPLETE][9] ([i915#2417]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [DMESG-WARN][11] ([i915#1982]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-bsw-kefka/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-bsw-kefka/igt@[email protected]
* igt@vgem_basic@unload:
- fi-skl-guc: [DMESG-WARN][13] ([i915#2203]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-skl-guc/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-skl-guc/igt@[email protected]
#### Warnings ####
* igt@gem_exec_suspend@basic-s3:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92]) -> [DMESG-WARN][16] ([i915#62] / [i915#92] / [i915#95]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-kbl-x1275/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/fi-kbl-x1275/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-kbl-x1275: [DMESG-WARN][17] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][18] ([i915#62] / [i915#92]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9078/fi-kbl-x1275/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/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).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2417]: https://gitlab.freedesktop.org/drm/intel/issues/2417
[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 (45 -> 38)
------------------------------
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_9078 -> Patchwork_18597
CI-20190529: 20190529
CI_DRM_9078: 22207ce3387936577adaff3742e6a0ee94a7518c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5794: eeccb2a17453f90ad92d1ab6f81ad7d344119d72 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18597: 6f2473ea8659ffb4301c2376944593ecead59b31 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6f2473ea8659 Revert "drm/i915: Force state->modeset=true when distrust_bios_wm==true"
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18597/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 25 lines · Stefan Joosten
The fix of flagging
state->modesetwheneverdistrust_bios_wmis set causes a regression when initializing display(s) attached to a Lenovo USB-C docking station. The display remains blank until the dock is reattached. Revert to bring the behavior of the functional v5.6 stable.This reverts commit
0f8839f5f323da04a800e6ced1136e4b1e1689a9.Signed-off-by Stefan Joosten <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 14 -------------- 1 file changed, 14 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +0
-4@@ -14942,20 +14942,6 @@ static int intel_atomic_check(struct drm_device *dev,if (ret) goto fail; -/* -* distrust_bios_wm will force a full dbuf recomputation -* but the hardware state will only get updated accordingly -* if state->modeset==true. Hence distrust_bios_wm==true &&
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 14958
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-10-* state->modeset==false is an invalid combination which -* would cause the hardware and software dbuf state to get -* out of sync. We must prevent that. -* -* FIXME clean up this mess and introduce better -* state tracking for dbuf. -*/ -if (dev_priv->wm.distrust_bios_wm) - any_ms = true; -
Argh. If only I had managed to land the full dbuf rework and nuke this mess before it came back to bite us...
This is definitely going to break something else, so not great.
Can you file an upstream bug at
https://gitlab.freedesktop.org/drm/intel/issues/new
and attach dmesgs from booting both good and bad kernels with drm.debug=0x1e passed to the kernel cmdline? Bump log_buf_len= if necessary to capture the full log.
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-0intel_fbc_choose_crtc (dev_priv, state); ret =calc_watermark_data (state);if (ret)Signature · 7 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dear Ville Syrjälä,
Thank you for responding so quickly.
I was occupied with work and life for the past two weeks, sorry about the wait, but have now managed to find some time to continue pursuing this issue again.
Quoted 2 lines · Ville Syrjälä
Argh. If only I had managed to land the full dbuf rework and nuke this mess before it came back to bite us...
Yeah... I know the feeling.
Quoted 1 line
This is definitely going to break something else, so not great.
I did expect that. The automated tests failing was a pretty good indicator.
You put that code in to take care of something. All I did was just tear it down because it happens to work better for me... blunt but functional for my purposes.
Seems to need some finesse or a condition to not cause my problem? Yet still function for the reason you put it in there for.
I am more than willing to play guinea pig and test patches on my end to improve it with you.
Quoted 5 lines
Can you file an upstream bug at
https://gitlab.freedesktop.org/drm/intel/issues/new
and attach dmesgs from booting both good and bad kernels with drm.debug=0x1e passed to the kernel cmdline? Bump log_buf_len= if necessary to capture the full log.
I have done so today.
It's at: https://gitlab.freedesktop.org/drm/intel/-/issues/2579
Signature · 6 lines
Stefan Joosten AT Computing BV Sharing and growing together Tel +31 24 352 72 82 Arnhemsestraatweg 33 [email protected] 6881 ND Velp www.atcomputing.nl