drm/i915/display/dp: On AUX xfer timeout restart freshly
Subsystems (3)
PATCH v3 1/1 drm/i915/display/dp: On AUX xfer timeout restart freshly
On AUX transfer timeout, as per DP spec need to retry for 3 times and has to be restarted freshly.
v3: handle timeout and dont rely on register value on timeout (Imre)
--- .../drm/i915/display/intel_display_types.h | 1 - drivers/gpu/drm/i915/display/intel_dp_aux.c | 72 +++++++++---------- 2 files changed, 34 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +0 -1
@@ -1741,7 +1741,6 @@ struct intel_dp {/* sink or branch descriptor */ struct drm_dp_desc desc;struct drm_dp_aux aux; -u32 aux_busy_last_status;u8 train_set[4 ];struct intel_pps pps;
drivers/gpu/drm/i915/display/intel_dp_aux.c +34 -38
121 lines not on this page · raw message
Signature · 1 line
2.25.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/display/dp: On AUX xfer timeout restart freshly (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915/display/dp: On AUX xfer timeout restart freshly (rev3)
URL : https://patchwork.freedesktop.org/series/119055/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13264 -> Patchwork_119055v3
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_119055v3 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_119055v3, 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_119055v3/index.html
Participating hosts (41 -> 40)
------------------------------
Additional (1): fi-kbl-soraka
Missing (2): fi-snb-2520m fi-pnv-d510
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_119055v3:
### IGT changes ###
#### Possible regressions ####
* igt@core_auth@basic-auth:
- fi-kbl-7567u: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-kbl-7567u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-7567u/igt@[email protected]
* igt@debugfs_test@read_all_entries:
- fi-kbl-soraka: NOTRUN -> [DMESG-WARN][3] +50 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-soraka/igt@debugfs_test@read_all_entries.html
- fi-kbl-7567u: [PASS][4] -> [ABORT][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-kbl-7567u/igt@debugfs_test@read_all_entries.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-7567u/igt@debugfs_test@read_all_entries.html
* igt@gem_exec_suspend@basic-s0@smem:
- bat-dg2-8: [PASS][6] -> [DMESG-WARN][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-8/igt@gem_exec_suspend@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@gem_exec_suspend@[email protected]
* igt@i915_module_load@load:
- bat-jsl-1: [PASS][8] -> [ABORT][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-jsl-1/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-jsl-1/igt@[email protected]
- fi-bsw-n3050: [PASS][10] -> [DMESG-WARN][11] +4 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-bsw-n3050/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-bsw-n3050/igt@[email protected]
- bat-adlp-6: [PASS][12] -> [ABORT][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adlp-6/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-6/igt@[email protected]
- fi-skl-6600u: [PASS][14] -> [ABORT][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-skl-6600u/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-skl-6600u/igt@[email protected]
- bat-jsl-3: [PASS][16] -> [ABORT][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-jsl-3/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-jsl-3/igt@[email protected]
- bat-adlp-9: [PASS][18] -> [DMESG-WARN][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adlp-9/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
- fi-skl-guc: [PASS][20] -> [DMESG-WARN][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-skl-guc/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-skl-guc/igt@[email protected]
- bat-adln-1: [PASS][22] -> [ABORT][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adln-1/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adln-1/igt@[email protected]
* igt@i915_selftest@live@ring_submission:
- fi-cfl-8109u: [PASS][24] -> [DMESG-WARN][25] +88 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-cfl-8109u/igt@i915_selftest@live@ring_submission.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-cfl-8109u/igt@i915_selftest@live@ring_submission.html
* igt@i915_suspend@basic-s3-without-i915:
- fi-apl-guc: [PASS][26] -> [DMESG-WARN][27] +5 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-apl-guc/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@kms_addfb_basic@clobberred-modifier:
- {bat-kbl-2}: [PASS][28] -> [DMESG-WARN][29] +88 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-kbl-2/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-kbl-2/igt@[email protected]
* {igt@kms_pipe_crc_basic@compare-crc-sanitycheck-xr24@pipe-c-edp-1}:
- fi-kbl-soraka: NOTRUN -> [DMESG-WARN][30] +2 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-soraka/igt@kms_pipe_crc_basic@[email protected]
Known issues
------------
Here are the changes found in Patchwork_119055v3 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@fbdev@info:
- bat-dg2-9: [PASS][31] -> [SKIP][32] ([i915#2582]) +4 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-9/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
- bat-dg2-8: [PASS][33] -> [SKIP][34] ([i915#2582]) +4 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-8/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@[email protected]
* igt@fbdev@read:
- bat-adlp-9: [PASS][35] -> [SKIP][36] ([i915#2582]) +4 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adlp-9/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
* igt@fbdev@write:
- fi-apl-guc: [PASS][37] -> [SKIP][38] ([fdo#109271]) +6 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-apl-guc/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#2190])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-soraka/igt@[email protected]
* igt@i915_module_load@load:
- fi-apl-guc: [PASS][40] -> [DMESG-WARN][41] ([i915#180] / [i915#7634])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-apl-guc/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@[email protected]
- fi-kbl-7567u: [PASS][42] -> [DMESG-WARN][43] ([i915#180])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-kbl-7567u/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-7567u/igt@[email protected]
* igt@i915_module_load@reload:
- fi-kbl-soraka: NOTRUN -> [DMESG-WARN][44] ([i915#1982]) +3 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-soraka/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [PASS][45] -> [DMESG-FAIL][46] ([i915#5334])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@mman:
- bat-rpls-1: [PASS][47] -> [TIMEOUT][48] ([i915#6794] / [i915#7392])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-rpls-1/igt@i915_selftest@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@reset:
- fi-apl-guc: [PASS][49] -> [DMESG-WARN][50] ([i915#7634]) +77 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-apl-guc/igt@i915_selftest@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- bat-rpls-1: NOTRUN -> [ABORT][51] ([i915#6687] / [i915#7978])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-rpls-1/igt@[email protected]
* igt@kms_busy@basic:
- bat-dg2-8: NOTRUN -> [SKIP][52] ([i915#5354]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@[email protected]
- fi-apl-guc: NOTRUN -> [SKIP][53] ([fdo#109271] / [i915#1845])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@[email protected]
* igt@kms_chamelium_frames@hdmi-crc-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][54] ([fdo#109271]) +14 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-soraka/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- bat-dg2-9: [PASS][55] -> [SKIP][56] ([i915#1845] / [i915#5354]) +5 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-9/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-apl-guc: [PASS][57] -> [SKIP][58] ([fdo#109271] / [i915#1845]) +5 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-apl-guc/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-legacy:
- bat-adlp-9: [PASS][59] -> [SKIP][60] ([i915#3546]) +5 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adlp-9/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-varying-size:
- bat-dg2-8: [PASS][61] -> [SKIP][62] ([i915#1845] / [i915#5354]) +5 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-8/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@[email protected]
* igt@kms_flip@basic-flip-vs-dpms:
- bat-dg2-9: NOTRUN -> [SKIP][63] ([i915#4098] / [i915#5354]) +3 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
* igt@kms_flip@basic-flip-vs-modeset:
- bat-adlp-9: NOTRUN -> [SKIP][64] ([i915#3637]) +3 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
* igt@kms_flip@basic-plain-flip:
- bat-dg2-8: NOTRUN -> [SKIP][65] ([i915#4098] / [i915#5354]) +3 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-cfl-8109u: [PASS][66] -> [SKIP][67] ([fdo#109271]) +12 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-cfl-8109u/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-cfl-8109u/igt@[email protected]
- bat-dg2-8: [PASS][68] -> [SKIP][69] ([i915#5354])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-8/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@[email protected]
- bat-adlp-9: [PASS][70] -> [SKIP][71] ([i915#4342])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adlp-9/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
- bat-dg2-9: [PASS][72] -> [SKIP][73] ([i915#5354])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-9/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12:
- bat-dg2-9: NOTRUN -> [SKIP][74] ([i915#5354]) +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
* igt@kms_pipe_crc_basic@hang-read-crc:
- bat-dg2-9: NOTRUN -> [SKIP][75] ([i915#1845] / [i915#5354]) +5 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc:
- fi-apl-guc: NOTRUN -> [SKIP][76] ([fdo#109271]) +10 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence:
- bat-adlp-9: NOTRUN -> [SKIP][77] ([i915#3546]) +7 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc:
- fi-cfl-8109u: NOTRUN -> [SKIP][78] ([fdo#109271]) +11 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-cfl-8109u/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-dg2-8: NOTRUN -> [SKIP][79] ([i915#1845] / [i915#5354]) +5 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@[email protected]
* igt@kms_setmode@basic-clone-single-crtc:
- fi-kbl-soraka: NOTRUN -> [SKIP][80] ([fdo#109271] / [i915#4579])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-kbl-soraka/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- bat-adlp-9: [PASS][81] -> [SKIP][82] ([fdo#109295] / [i915#3546] / [i915#3708])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adlp-9/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_mocs:
- {bat-mtlp-6}: [DMESG-FAIL][83] ([i915#7059]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
* igt@i915_selftest@live@slpc:
- {bat-mtlp-6}: [DMESG-WARN][85] ([i915#6367]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-mtlp-6/igt@i915_selftest@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-mtlp-6/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- bat-adlp-9: [SKIP][87] ([i915#4103]) -> [SKIP][88] ([i915#3546]) +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-adlp-9/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-adlp-9/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-dg2-9: [SKIP][89] ([i915#4103] / [i915#4213]) -> [SKIP][90] ([i915#1845] / [i915#5354]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-9/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
- bat-dg2-8: [SKIP][91] ([i915#4103] / [i915#4213]) -> [SKIP][92] ([i915#1845] / [i915#5354]) +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-8/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/igt@[email protected]
- fi-apl-guc: [SKIP][93] ([fdo#109271]) -> [SKIP][94] ([fdo#109271] / [i915#1845]) +1 similar issue
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/fi-apl-guc/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/fi-apl-guc/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- bat-dg2-9: [SKIP][95] ([i915#3708]) -> [SKIP][96] ([i915#3708] / [i915#5354])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-9/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-9/igt@[email protected]
- bat-dg2-8: [SKIP][97] ([i915#3708]) -> [SKIP][98] ([i915#3708] / [i915#5354])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13264/bat-dg2-8/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/bat-dg2-8/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
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4342]: https://gitlab.freedesktop.org/drm/intel/issues/4342
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#6763]: https://gitlab.freedesktop.org/drm/intel/issues/6763
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7634]: https://gitlab.freedesktop.org/drm/intel/issues/7634
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#8141]: https://gitlab.freedesktop.org/drm/intel/issues/8141
[i915#8423]: https://gitlab.freedesktop.org/drm/intel/issues/8423
Build changes
-------------
* Linux: CI_DRM_13264 -> Patchwork_119055v3
CI-20190529: 20190529
CI_DRM_13264: 807d06e86e11466ef4fe74e2ddcb93de8e3a535b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7326: 02c2cf17628b6203d6105d4a91dfe8a101d482ce @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119055v3: 807d06e86e11466ef4fe74e2ddcb93de8e3a535b @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
503aaa32e745 drm/i915/display/dp: On AUX xfer timeout restart freshly
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119055v3/index.html
Quoted 59 lines · Arun R Murthy
On AUX transfer timeout, as per DP spec need to retry for 3 times and has to be restarted freshly.
v3: handle timeout and dont rely on register value on timeout (Imre)
Signed-off-by Arun R Murthy <[email protected]>--- .../drm/i915/display/intel_display_types.h | 1 - drivers/gpu/drm/i915/display/intel_dp_aux.c | 72 +++++++++---------- 2 files changed, 34 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/display/intel_display_types.h +0
-1@@ -1741,7 +1741,6 @@ struct intel_dp {/* sink or branch descriptor */ struct drm_dp_desc desc;struct drm_dp_aux aux; -u32 aux_busy_last_status;u8 train_set[4 ];struct intel_pps pps;drivers/gpu/drm/i915/display/intel_dp_aux.c +5
-6@@ -36,25 +36,24 @@ static void intel_dp_aux_unpack(u32 src, u8 *dst, int dst_bytes) dst[i] = src >> ((3 - i) *8 ); } -static u32 -intel_dp_aux_wait_done (struct intel_dp *intel_dp) +static int +intel_dp_aux_wait_done (struct intel_dp *intel_dp,u32 *status) {struct drm_i915_private *i915 =dp_to_i915 (intel_dp);i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg (intel_dp);const unsigned int timeout_ms =10 ; -u32 status;int ret; ret =__intel_de_wait_for_register (i915, ch_ctl,DP_AUX_CH_CTL_SEND_BUSY ,0 , -2 , timeout_ms, &status); +50 , timeout_ms, status);if (ret == -ETIMEDOUT )drm_err (&i915->drm,"%s: did not complete or timeout within %ums (status 0x%08x)\n" , - intel_dp->aux.name, timeout_ms, status); + intel_dp->aux.name, timeout_ms, *status); -return status; +return ret; }static u32 g4x_get_aux_clock_divider (struct intel_dp *intel_dp,int index)
drivers/gpu/drm/i915/display/intel_dp_aux.c static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, · line 189
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-1@@ -186,10 +185,7 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,*/ ret =DP_AUX_CH_CTL_SEND_BUSY | DP_AUX_CH_CTL_DONE | - DP_AUX_CH_CTL_INTERRUPT |
The above one-liner change, also applied in g4x_get_aux_send_ctl() should be a separate patch.
Quoted 74 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +21
-30-DP_AUX_CH_CTL_TIME_OUT_ERROR |DP_AUX_CH_CTL_TIME_OUT_MAX | -DP_AUX_CH_CTL_RECEIVE_ERROR |DP_AUX_CH_CTL_MESSAGE_SIZE (send_bytes) |DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (intel_dp_aux_fw_sync_len ()) |DP_AUX_CH_CTL_SYNC_PULSE_SKL (intel_dp_aux_sync_len ());@@ -273,30 +269,6 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,* it using the same AUX CH simultaneously */ -/* Try to wait for any previous AUX channel activity */ -for (try =0 ; try <3 ; try++) { - status =intel_de_read_notrace (i915, ch_ctl); -if ((status &DP_AUX_CH_CTL_SEND_BUSY ) ==0 ) -break ; -msleep (1 ); - } -/* just trace the final value */ -trace_i915_reg_rw (false, ch_ctl, status,sizeof (status), true); - -if (try ==3 ) { -const u32 status =intel_de_read (i915, ch_ctl); - -if (status != intel_dp->aux_busy_last_status) { -drm_WARN (&i915->drm,1 , -"%s: not started (status 0x%08x)\n" , - intel_dp->aux.name, status); - intel_dp->aux_busy_last_status = status; - } - - ret = -EBUSY ; - goto out; - } -/* Only 5 data registers! */ if (drm_WARN_ON (&i915->drm, send_bytes >20 || recv_size >20 )) { ret = -E2BIG ;@@ -304,14 +276,31 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, }while ((aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp, clock++))) { -u32 send_ctl = intel_dp->get_aux_send_ctl (intel_dp, +/* Must try at least 3 times according to DP spec */ +for (try =0 ; try <5 ; try++) { +u32 send_ctl = intel_dp->get_aux_send_ctl (intel_dp, send_bytes, aux_clock_divider); - send_ctl |= aux_send_ctl_flags; + send_ctl |= aux_send_ctl_flags; + +/* Try to wait for any previous AUX channel activity */ +/* TODO: if typeC then 4.2ms else 800us. For DG2 add 1.5ms for both cases */ + ret =intel_dp_aux_wait_done (intel_dp, &status); +/* just trace the final value */ +trace_i915_reg_rw (false, ch_ctl, status,sizeof (status), true); + +/* On timeout dont read the status bits as its not updated */ +if (ret == -ETIMEDOUT ) { +drm_WARN (&i915->drm,1 , +"%s: not started, previous Tx still in process (status 0x%08x)\n" , + intel_dp->aux.name, status); +if (try >3 ) + goto out; +else +continue ; + } -/* Must try at least 3 times according to DP spec */ -for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */ for (i =0 ; i < send_bytes; i +=4 ) intel_de_write(i915, ch_data[i >> 2],
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 324
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +3
-1@@ -320,8 +309,15 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,/* Send the command and wait for it to complete */ intel_de_write (i915, ch_ctl, send_ctl); +intel_de_rmw (i915, ch_ctl,DP_AUX_CH_CTL_INTERRUPT | +DP_AUX_CH_CTL_TIME_OUT_ERROR | +DP_AUX_CH_CTL_RECEIVE_ERROR ,0 ); - status =intel_dp_aux_wait_done (intel_dp);
The review comments were not addressed and these changes still don't make sense to me. What I meant is - instead of all the above changes - bailing out at this point if DP_AUX_CH_CTL_SEND_BUSY is still set in status.
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +5
-0+ ret =intel_dp_aux_wait_done (intel_dp, &status); + +/* On timeout dont read the status bits as its not updated */ +if (ret == -ETIMEDOUT ) +continue ;/* Clear done status and any errors */ intel_de_write(i915, ch_ctl,Signature · 1 line
2.25.1
Quoted 171 lines
-----Original Message-----
From: Deak, Imre <[email protected]>
Sent: Tuesday, June 13, 2023 4:19 PM
To: Murthy, Arun R <[email protected]>
Cc: [email protected]; Nikula, Jani <[email protected]>
Subject: Re: [PATCHv3] drm/i915/display/dp: On AUX xfer timeout restart freshlydrivers/gpu/drm/i915/display/intel_dp_aux.c static void intel_dp_aux_unpack(u32 src, u8 *dst,
Quoted 30 lines · Arun R Murthy
On AUX transfer timeout, as per DP spec need to retry for 3 times and has to be restarted freshly.
v3: handle timeout and dont rely on register value on timeout (Imre)
Signed-off-by Arun R Murthy <[email protected]>--- .../drm/i915/display/intel_display_types.h | 1 - drivers/gpu/drm/i915/display/intel_dp_aux.c | 72 +++++++++---------- 2 files changed, 34 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/display/intel_display_types.h +0
-1@@ -1741,7 +1741,6 @@ struct intel_dp {/* sink or branch descriptor */ struct drm_dp_desc desc;struct drm_dp_aux aux; -u32 aux_busy_last_status;u8 train_set[4 ];struct intel_pps pps;drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-0@@ -36,25 +36,24 @@ static void intel_dp_aux_unpack(u32 src, u8 *dst,int
dst_bytes)Quoted 12 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-3dst[i] = src >> ((3 - i) *8 ); } -static u32 -intel_dp_aux_wait_done (struct intel_dp *intel_dp) +static int +intel_dp_aux_wait_done (struct intel_dp *intel_dp,u32 *status) {struct drm_i915_private *i915 =dp_to_i915 (intel_dp);i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg (intel_dp);const unsigned int timeout_ms =10 ; -u32 status;drivers/gpu/drm/i915/display/intel_dp_aux.c static void intel_dp_aux_unpack(u32 src, u8 *dst, int dst_bytes)
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-1int ret; ret =__intel_de_wait_for_register (i915, ch_ctl,DP_AUX_CH_CTL_SEND_BUSY ,0 , -2 , timeout_ms, &status); +50 , timeout_ms, status);if (ret == -ETIMEDOUT ) drm_err(&i915->drm, "%s: did not complete or timeout within %ums(status 0x%08x)\n",
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-2- intel_dp->aux.name, timeout_ms, status); + intel_dp->aux.name, timeout_ms, *status); -return status; +return ret; } static u32 g4x_get_aux_clock_divider(struct intel_dp *intel_dp, intindex) @@ -186,10 +185,7 @@ static u32 skl_get_aux_send_ctl(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, · line 189
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-1*/ ret =DP_AUX_CH_CTL_SEND_BUSY | DP_AUX_CH_CTL_DONE | - DP_AUX_CH_CTL_INTERRUPT |The above one-liner change, also applied in
g4x_get_aux_send_ctl()should be a separate patch.drivers/gpu/drm/i915/display/intel_dp_aux.c static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, · line 189
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-2-DP_AUX_CH_CTL_TIME_OUT_ERROR |DP_AUX_CH_CTL_TIME_OUT_MAX | -DP_AUX_CH_CTL_RECEIVE_ERROR | DP_AUX_CH_CTL_MESSAGE_SIZE(send_bytes) |DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(intel_dp_aux_fw_sync_len())|
Quoted 1 line
DP_AUX_CH_CTL_SYNC_PULSE_SKL(intel_dp_aux_sync_len());Quoted 37 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-25@@ -273,30 +269,6 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,* it using the same AUX CH simultaneously */ -/* Try to wait for any previous AUX channel activity */ -for (try =0 ; try <3 ; try++) { - status =intel_de_read_notrace (i915, ch_ctl); -if ((status &DP_AUX_CH_CTL_SEND_BUSY ) ==0 ) -break ; -msleep (1 ); - } -/* just trace the final value */ -trace_i915_reg_rw (false, ch_ctl, status,sizeof (status), true); - -if (try ==3 ) { -const u32 status =intel_de_read (i915, ch_ctl); - -if (status != intel_dp->aux_busy_last_status) { -drm_WARN (&i915->drm,1 , -"%s: not started (status 0x%08x)\n" , - intel_dp->aux.name, status); - intel_dp->aux_busy_last_status = status; - } - - ret = -EBUSY ; - goto out; - } -/* Only 5 data registers! */ if (drm_WARN_ON (&i915->drm, send_bytes >20 || recv_size >20 )) { ret = -E2BIG ;@@ -304,14 +276,31 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, }while ((aux_clock_divider = intel_dp-get_aux_clock_divider (intel_dp, clock++))) { - u32 send_ctl = intel_dp->get_aux_send_ctl(intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 288
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +6
-1+/* Must try at least 3 times according to DP spec */ +for (try =0 ; try <5 ; try++) { +u32 send_ctl = intel_dp->get_aux_send_ctl (intel_dp, send_bytes, aux_clock_divider); - send_ctl |= aux_send_ctl_flags; + send_ctl |= aux_send_ctl_flags; + +/* Try to wait for any previous AUX channel activity */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 289
Quoted 1 line
drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-0+/* TODO: if typeC then 4.2ms else 800us. For DG2 add 1.5ms for both cases */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +3
-0+ ret =intel_dp_aux_wait_done (intel_dp, &status); +/* just trace the final value */ + trace_i915_reg_rw(false, ch_ctl, status, sizeof(status),true);
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 294
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-0+ +/* On timeout dont read the status bits as its not updated */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +3
-0+if (ret == -ETIMEDOUT ) { + drm_WARN(&i915->drm, 1, + "%s: not started, previous Tx still inprocess (status 0x%08x)\n",
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +6
-2+ intel_dp->aux.name, status); +if (try >3 ) + goto out; +else +continue ; + } -/* Must try at least 3 times according to DP spec */ -for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-0for (i =0 ; i < send_bytes; i +=4 )intel_de_write(i915, ch_data[i >> 2], @@ -
320,8 +309,15 @@
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 5 lines
intel_dp_aux_xfer(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-0/* Send the command and wait for it to complete */ intel_de_write (i915, ch_ctl, send_ctl); + intel_de_rmw(i915, ch_ctl,
DP_AUX_CH_CTL_INTERRUPT|
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 324
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-1+DP_AUX_CH_CTL_TIME_OUT_ERROR | + DP_AUX_CH_CTL_RECEIVE_ERROR, 0); - status =intel_dp_aux_wait_done (intel_dp);The review comments were not addressed and these changes still don't make sense to me. What I meant is - instead of all the above changes - bailing out at this point if
DP_AUX_CH_CTL_SEND_BUSYis still set in status.
I think my 2st patch version had considered this SEND_BUSY bit. In the beginning of this loop there is a check for SEND_BUSY to ensure that the previous aux transaction is complete. Then we write the data and here we check for error(timeout or receive) only. If SEND_BUSY is checked over here again the code for aux transaction in progress check will be duplicated.
Will be floating v6 patch which takes care of this SEND_BUSY and acts upon properly.
Thanks and Regards,
Arun R Murthy
--------------------
Quoted 180 lines · Arun R
Quoted 171 lines
-----Original Message-----
From: Deak, Imre <[email protected]>
Sent: Tuesday, June 13, 2023 4:19 PM
To: Murthy, Arun R <[email protected]>
Cc: [email protected]; Nikula, Jani <[email protected]>
Subject: Re: [PATCHv3] drm/i915/display/dp: On AUX xfer timeout restart freshlydrivers/gpu/drm/i915/display/intel_dp_aux.c static void intel_dp_aux_unpack(u32 src, u8 *dst,
Quoted 30 lines · Arun R Murthy
On AUX transfer timeout, as per DP spec need to retry for 3 times and has to be restarted freshly.
v3: handle timeout and dont rely on register value on timeout (Imre)
Signed-off-by Arun R Murthy <[email protected]>--- .../drm/i915/display/intel_display_types.h | 1 - drivers/gpu/drm/i915/display/intel_dp_aux.c | 72 +++++++++---------- 2 files changed, 34 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/display/intel_display_types.h +0
-1@@ -1741,7 +1741,6 @@ struct intel_dp {/* sink or branch descriptor */ struct drm_dp_desc desc;struct drm_dp_aux aux; -u32 aux_busy_last_status;u8 train_set[4 ];struct intel_pps pps;drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-0@@ -36,25 +36,24 @@ static void intel_dp_aux_unpack(u32 src, u8 *dst,int
dst_bytes)Quoted 12 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-3dst[i] = src >> ((3 - i) *8 ); } -static u32 -intel_dp_aux_wait_done (struct intel_dp *intel_dp) +static int +intel_dp_aux_wait_done (struct intel_dp *intel_dp,u32 *status) {struct drm_i915_private *i915 =dp_to_i915 (intel_dp);i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg (intel_dp);const unsigned int timeout_ms =10 ; -u32 status;drivers/gpu/drm/i915/display/intel_dp_aux.c static void intel_dp_aux_unpack(u32 src, u8 *dst, int dst_bytes)
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-1int ret; ret =__intel_de_wait_for_register (i915, ch_ctl,DP_AUX_CH_CTL_SEND_BUSY ,0 , -2 , timeout_ms, &status); +50 , timeout_ms, status);if (ret == -ETIMEDOUT ) drm_err(&i915->drm, "%s: did not complete or timeout within %ums(status 0x%08x)\n",
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-2- intel_dp->aux.name, timeout_ms, status); + intel_dp->aux.name, timeout_ms, *status); -return status; +return ret; } static u32 g4x_get_aux_clock_divider(struct intel_dp *intel_dp, intindex) @@ -186,10 +185,7 @@ static u32 skl_get_aux_send_ctl(struct
intel_dp*intel_dp,Quoted 4 lines
*/
ret =DP_AUX_CH_CTL_SEND_BUSY|
DP_AUX_CH_CTL_DONE|
-DP_AUX_CH_CTL_INTERRUPT|The above one-liner change, also applied in
g4x_get_aux_send_ctl()should be a separate patch.drivers/gpu/drm/i915/display/intel_dp_aux.c static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, · line 189
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-2-DP_AUX_CH_CTL_TIME_OUT_ERROR |DP_AUX_CH_CTL_TIME_OUT_MAX | -DP_AUX_CH_CTL_RECEIVE_ERROR | DP_AUX_CH_CTL_MESSAGE_SIZE(send_bytes) |DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(intel_dp_aux_fw_sync_len())|
Quoted 1 line
DP_AUX_CH_CTL_SYNC_PULSE_SKL(intel_dp_aux_sync_len());Quoted 37 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-25@@ -273,30 +269,6 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,* it using the same AUX CH simultaneously */ -/* Try to wait for any previous AUX channel activity */ -for (try =0 ; try <3 ; try++) { - status =intel_de_read_notrace (i915, ch_ctl); -if ((status &DP_AUX_CH_CTL_SEND_BUSY ) ==0 ) -break ; -msleep (1 ); - } -/* just trace the final value */ -trace_i915_reg_rw (false, ch_ctl, status,sizeof (status), true); - -if (try ==3 ) { -const u32 status =intel_de_read (i915, ch_ctl); - -if (status != intel_dp->aux_busy_last_status) { -drm_WARN (&i915->drm,1 , -"%s: not started (status 0x%08x)\n" , - intel_dp->aux.name, status); - intel_dp->aux_busy_last_status = status; - } - - ret = -EBUSY ; - goto out; - } -/* Only 5 data registers! */ if (drm_WARN_ON (&i915->drm, send_bytes >20 || recv_size >20 )) { ret = -E2BIG ;@@ -304,14 +276,31 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, }while ((aux_clock_divider = intel_dp-get_aux_clock_divider (intel_dp, clock++))) { - u32 send_ctl = intel_dp->get_aux_send_ctl(intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 288
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +6
-1+/* Must try at least 3 times according to DP spec */ +for (try =0 ; try <5 ; try++) { +u32 send_ctl = intel_dp->get_aux_send_ctl (intel_dp, send_bytes, aux_clock_divider); - send_ctl |= aux_send_ctl_flags; + send_ctl |= aux_send_ctl_flags; + +/* Try to wait for any previous AUX channel activity */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 289
Quoted 1 line
drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-0+/* TODO: if typeC then 4.2ms else 800us. For DG2 add 1.5ms for both cases */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +3
-0+ ret =intel_dp_aux_wait_done (intel_dp, &status); +/* just trace the final value */ + trace_i915_reg_rw(false, ch_ctl, status, sizeof(status),true);
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 294
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-0+ +/* On timeout dont read the status bits as its not updated */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +3
-0+if (ret == -ETIMEDOUT ) { + drm_WARN(&i915->drm, 1, + "%s: not started, previous Tx still inprocess (status 0x%08x)\n",
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +6
-2+ intel_dp->aux.name, status); +if (try >3 ) + goto out; +else +continue ; + } -/* Must try at least 3 times according to DP spec */ -for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-0for (i =0 ; i < send_bytes; i +=4 )intel_de_write(i915, ch_data[i >> 2], @@ -320,8 +309,15 @@
Quoted 5 lines
intel_dp_aux_xfer(struct
intel_dp*intel_dp,/* Send the command and wait for it to complete */ intel_de_write(i915, ch_ctl, send_ctl);+ intel_de_rmw(i915,
ch_ctl,
DP_AUX_CH_CTL_INTERRUPT|Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 324
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-1+DP_AUX_CH_CTL_TIME_OUT_ERROR | + DP_AUX_CH_CTL_RECEIVE_ERROR, 0); - status =intel_dp_aux_wait_done (intel_dp);The review comments were not addressed and these changes still don't make sense to me. What I meant is - instead of all the above changes - bailing out at this point if
DP_AUX_CH_CTL_SEND_BUSYis still set in status.
Quoted 7 lines
I think my 2st patch version had considered this
SEND_BUSYbit. In the beginning of this loop there is a check forSEND_BUSYto ensure that the previous aux transaction is complete.Then we write the data and here we check for error(timeout or receive) only. If
SEND_BUSYis checked over here again the code for aux transaction in progress check will be duplicated.
There is already a check in the current code for SEND_BUSY before the first transaction attempt. Any subsequent error handling, including checking for SEND_BUSY being still set, should be done at one place after waiting for the transaction to complete (along with TIME_OUT_ERROR and RECEIVE_ERROR checks). I don't see a reason to repeat the call to intel_dp_aux_wait_done() as in this patch, right after it has already timed out.
Quoted 6 lines
Will be floating v6 patch which takes care of this
SEND_BUSYand acts upon properly.Thanks and Regards,
Arun R Murthy
--------------------
Quoted 107 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Arun R Murthy
Sent: Tuesday, June 13, 2023 7:43 AM
To: [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [Intel-gfx] [PATCHv3] drm/i915/display/dp: On AUX xfer timeout restart freshlyOn AUX transfer timeout, as per DP spec need to retry for 3 times and has to be restarted freshly.
v3: handle timeout and dont rely on register value on timeout (Imre)
Signed-off-by Arun R Murthy <[email protected]>--- .../drm/i915/display/intel_display_types.h | 1 - drivers/gpu/drm/i915/display/intel_dp_aux.c | 72 +++++++++---------- 2 files changed, 34 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/display/intel_display_types.h +0
-1@@ -1741,7 +1741,6 @@ struct intel_dp {/* sink or branch descriptor */ struct drm_dp_desc desc;struct drm_dp_aux aux; -u32 aux_busy_last_status;u8 train_set[4 ];struct intel_pps pps;drivers/gpu/drm/i915/display/intel_dp_aux.c +5
-6@@ -36,25 +36,24 @@ static void intel_dp_aux_unpack(u32 src, u8 *dst, int dst_bytes) dst[i] = src >> ((3 - i) *8 ); } -static u32 -intel_dp_aux_wait_done (struct intel_dp *intel_dp) +static int +intel_dp_aux_wait_done (struct intel_dp *intel_dp,u32 *status) {struct drm_i915_private *i915 =dp_to_i915 (intel_dp);i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg (intel_dp);const unsigned int timeout_ms =10 ; -u32 status;int ret; ret =__intel_de_wait_for_register (i915, ch_ctl,DP_AUX_CH_CTL_SEND_BUSY ,0 , -2 , timeout_ms, &status); +50 , timeout_ms, status);if (ret == -ETIMEDOUT )drm_err (&i915->drm,"%s: did not complete or timeout within %ums (status 0x%08x)\n" , - intel_dp->aux.name, timeout_ms, status); + intel_dp->aux.name, timeout_ms, *status); -return status; +return ret; } static u32 g4x_get_aux_clock_divider(struct intel_dp *intel_dp, int index) @@ -186,10 +185,7 @@ static u32skl_get_aux_send_ctl(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-27*/ ret =DP_AUX_CH_CTL_SEND_BUSY |DP_AUX_CH_CTL_DONE | -DP_AUX_CH_CTL_INTERRUPT | -DP_AUX_CH_CTL_TIME_OUT_ERROR |DP_AUX_CH_CTL_TIME_OUT_MAX | -DP_AUX_CH_CTL_RECEIVE_ERROR |DP_AUX_CH_CTL_MESSAGE_SIZE (send_bytes) |DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (intel_dp_aux_fw_sync_len ()) |DP_AUX_CH_CTL_SYNC_PULSE_SKL (intel_dp_aux_sync_len ());@@ -273,30 +269,6 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,* it using the same AUX CH simultaneously */ -/* Try to wait for any previous AUX channel activity */ -for (try =0 ; try <3 ; try++) { - status =intel_de_read_notrace (i915, ch_ctl); -if ((status &DP_AUX_CH_CTL_SEND_BUSY ) ==0 ) -break ; -msleep (1 ); - } -/* just trace the final value */ -trace_i915_reg_rw (false, ch_ctl, status,sizeof (status), true); - -if (try ==3 ) { -const u32 status =intel_de_read (i915, ch_ctl); - -if (status != intel_dp->aux_busy_last_status) { -drm_WARN (&i915->drm,1 , -"%s: not started (status 0x%08x)\n" , - intel_dp->aux.name, status); - intel_dp->aux_busy_last_status = status; - } - - ret = -EBUSY ; - goto out; - } -/* Only 5 data registers! */ if (drm_WARN_ON (&i915->drm, send_bytes >20 || recv_size >20 )) { ret = -E2BIG ;
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 280
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-1@@ -304,14 +276,31 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, }while ((aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp, clock++))) { - u32 send_ctl = intel_dp->get_aux_send_ctl(intel_dp, +/* Must try at least 3 times according to DP spec */ +for (try =0 ; try <5 ; try++) {
It seems that we try 5 times here. Was this intention or keep tries in 3 as commit message/comment would suggest?
-Mika-
Quoted 48 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +19
-3+u32 send_ctl = intel_dp->get_aux_send_ctl (intel_dp, send_bytes, aux_clock_divider); - send_ctl |= aux_send_ctl_flags; + send_ctl |= aux_send_ctl_flags; + +/* Try to wait for any previous AUX channel activity */ +/* TODO: if typeC then 4.2ms else 800us. For DG2 add 1.5ms for both cases */ + ret =intel_dp_aux_wait_done (intel_dp, &status); +/* just trace the final value */ +trace_i915_reg_rw (false, ch_ctl, status,sizeof (status), true); + +/* On timeout dont read the status bits as its not updated */ +if (ret == -ETIMEDOUT ) { +drm_WARN (&i915->drm,1 , +"%s: not started, previous Tx still in process (status 0x%08x)\n" , + intel_dp->aux.name, status); +if (try >3 ) + goto out; +else +continue ; + } -/* Must try at least 3 times according to DP spec */ -for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */ for (i =0 ; i < send_bytes; i +=4 ) intel_de_write(i915, ch_data[i >> 2], @@ -320,8 +309,15 @@ intel_dp_aux_xfer(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c +8
-2/* Send the command and wait for it to complete */ intel_de_write (i915, ch_ctl, send_ctl); +intel_de_rmw (i915, ch_ctl,DP_AUX_CH_CTL_INTERRUPT | +DP_AUX_CH_CTL_TIME_OUT_ERROR | +DP_AUX_CH_CTL_RECEIVE_ERROR ,0 ); - status =intel_dp_aux_wait_done (intel_dp); + ret =intel_dp_aux_wait_done (intel_dp, &status); + +/* On timeout dont read the status bits as its not updated */ +if (ret == -ETIMEDOUT ) +continue ;/* Clear done status and any errors */ intel_de_write(i915, ch_ctl, --2.25.1
Quoted 129 lines
-----Original Message-----
From: Kahola, Mika <[email protected]>
Sent: Tuesday, June 13, 2023 6:02 PM
To: Murthy, Arun R <[email protected]>; intel- [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: RE: [Intel-gfx] [PATCHv3] drm/i915/display/dp: On AUX xfer timeout restart freshlyQuoted 10 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Arun R Murthy
Sent: Tuesday, June 13, 2023 7:43 AM
To: [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [Intel-gfx] [PATCHv3] drm/i915/display/dp: On AUX xfer timeout restart freshlyOn AUX transfer timeout, as per DP spec need to retry for 3 times and has
to be restarted freshly.
drivers/gpu/drm/i915/display/intel_dp_aux.c static void intel_dp_aux_unpack(u32 src, u8 *dst,
Quoted 28 lines
v3: handle timeout and dont rely on register value on timeout (Imre)
Signed-off-by Arun R Murthy <[email protected]>--- .../drm/i915/display/intel_display_types.h | 1 - drivers/gpu/drm/i915/display/intel_dp_aux.c | 72 +++++++++---------- 2 files changed, 34 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/display/intel_display_types.h +0
-1@@ -1741,7 +1741,6 @@ struct intel_dp {/* sink or branch descriptor */ struct drm_dp_desc desc;struct drm_dp_aux aux; -u32 aux_busy_last_status;u8 train_set[4 ];struct intel_pps pps;drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-0@@ -36,25 +36,24 @@ static void intel_dp_aux_unpack(u32 src, u8 *dst,int
dst_bytes)Quoted 12 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-3dst[i] = src >> ((3 - i) *8 ); } -static u32 -intel_dp_aux_wait_done (struct intel_dp *intel_dp) +static int +intel_dp_aux_wait_done (struct intel_dp *intel_dp,u32 *status) {struct drm_i915_private *i915 =dp_to_i915 (intel_dp);i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg (intel_dp);const unsigned int timeout_ms =10 ; -u32 status;drivers/gpu/drm/i915/display/intel_dp_aux.c static void intel_dp_aux_unpack(u32 src, u8 *dst, int dst_bytes)
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-1int ret; ret =__intel_de_wait_for_register (i915, ch_ctl,DP_AUX_CH_CTL_SEND_BUSY ,0 , -2 , timeout_ms, &status); +50 , timeout_ms, status);if (ret == -ETIMEDOUT ) drm_err(&i915->drm, "%s: did not complete or timeout within %ums(status 0x%08x)\n",
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-2- intel_dp->aux.name, timeout_ms, status); + intel_dp->aux.name, timeout_ms, *status); -return status; +return ret; } static u32 g4x_get_aux_clock_divider(struct intel_dp *intel_dp, intindex) @@ -186,10 +185,7 @@ static u32 skl_get_aux_send_ctl(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, · line 189
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-3*/ ret =DP_AUX_CH_CTL_SEND_BUSY |DP_AUX_CH_CTL_DONE | -DP_AUX_CH_CTL_INTERRUPT | -DP_AUX_CH_CTL_TIME_OUT_ERROR |DP_AUX_CH_CTL_TIME_OUT_MAX | -DP_AUX_CH_CTL_RECEIVE_ERROR | DP_AUX_CH_CTL_MESSAGE_SIZE(send_bytes) |DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(intel_dp_aux_fw_sync_len())|
Quoted 1 line
DP_AUX_CH_CTL_SYNC_PULSE_SKL(intel_dp_aux_sync_len());Quoted 34 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-24@@ -273,30 +269,6 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,* it using the same AUX CH simultaneously */ -/* Try to wait for any previous AUX channel activity */ -for (try =0 ; try <3 ; try++) { - status =intel_de_read_notrace (i915, ch_ctl); -if ((status &DP_AUX_CH_CTL_SEND_BUSY ) ==0 ) -break ; -msleep (1 ); - } -/* just trace the final value */ -trace_i915_reg_rw (false, ch_ctl, status,sizeof (status), true); - -if (try ==3 ) { -const u32 status =intel_de_read (i915, ch_ctl); - -if (status != intel_dp->aux_busy_last_status) { -drm_WARN (&i915->drm,1 , -"%s: not started (status 0x%08x)\n" , - intel_dp->aux.name, status); - intel_dp->aux_busy_last_status = status; - } - - ret = -EBUSY ; - goto out; - } -/* Only 5 data registers! */ if (drm_WARN_ON (&i915->drm, send_bytes >20 || recv_size >20 )) { ret = -E2BIG ;@@ -304,14 +276,31 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, }
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 280
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-1while ((aux_clock_divider = intel_dp-get_aux_clock_divider (intel_dp, clock++))) { - u32 send_ctl = intel_dp->get_aux_send_ctl(intel_dp, +/* Must try at least 3 times according to DP spec */ +for (try =0 ; try <5 ; try++) {It seems that we try 5 times here. Was this intention or keep tries in 3 as commit message/comment would suggest?
Will change the comment. As per the spec yes its 3 times, but with software overhead we have been trying this retry for 5 times.
Thanks and Regards,
Arun R Murthy
--------------------
Quoted 58 lines
-Mika-
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +4
-1+u32 send_ctl = intel_dp->get_aux_send_ctl (intel_dp, send_bytes, aux_clock_divider); - send_ctl |= aux_send_ctl_flags; + send_ctl |= aux_send_ctl_flags; + +/* Try to wait for any previous AUX channel activity */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 289
Quoted 1 line
drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-0+/* TODO: if typeC then 4.2ms else 800us. For DG2 add 1.5ms for both cases */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +3
-0+ ret =intel_dp_aux_wait_done (intel_dp, &status); +/* just trace the final value */ + trace_i915_reg_rw(false, ch_ctl, status, sizeof(status),true);
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp, · line 294
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-0+ +/* On timeout dont read the status bits as its not updated */
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +3
-0+if (ret == -ETIMEDOUT ) { + drm_WARN(&i915->drm, 1, + "%s: not started, previous Tx still inprocess (status 0x%08x)\n",
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +6
-2+ intel_dp->aux.name, status); +if (try >3 ) + goto out; +else +continue ; + } -/* Must try at least 3 times according to DP spec */ -for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */
Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +0
-0for (i =0 ; i < send_bytes; i +=4 )intel_de_write(i915, ch_data[i >> 2], @@ -
320,8 +309,15 @@
drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 5 lines
intel_dp_aux_xfer(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/display/intel_dp_aux.c +1
-0/* Send the command and wait for it to complete */ intel_de_write (i915, ch_ctl, send_ctl); + intel_de_rmw(i915, ch_ctl,
DP_AUX_CH_CTL_INTERRUPT|drivers/gpu/drm/i915/display/intel_dp_aux.c intel_dp_aux_xfer(struct intel_dp *intel_dp,
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +5
-1+DP_AUX_CH_CTL_TIME_OUT_ERROR | + DP_AUX_CH_CTL_RECEIVE_ERROR, 0); - status =intel_dp_aux_wait_done (intel_dp); + ret =intel_dp_aux_wait_done (intel_dp, &status); + +/* On timeout dont read the status bits as its not updated */
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp_aux.c +2
-1+if (ret == -ETIMEDOUT ) +continue ;/* Clear done status and any errors */ intel_de_write(i915, ch_ctl, --2.25.1