drm/i915/dp: On link train failure on eDP, retry with max params first
Subsystems (2)
PATCH v2 1/1 drm/i915/dp: On link train failure on eDP, retry with max params first
Certain eDP panels fail to link train with optimized settings for link rate and lane count and need the max link parameters to be used for link training to pass.
So in on link training failure for eDP, retry the link training with max link parameters first since this tends to fix link failures on most eDP 1.4 panels
v2:
* Forgot to ammend the previous patch with the fixes. This is a clean fixed patch
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109959
--- drivers/gpu/drm/i915/intel_dp.c | 37 +++++++++++++++++++++----------- drivers/gpu/drm/i915/intel_drv.h | 3 +++ 2 files changed, 27 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +24 -13
@@ -463,6 +463,14 @@ static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp,return true; } +static bool intel_dp_uses_max_link_params (struct intel_dp *intel_dp, +int link_rate, +u8 lane_count) +{ +return link_rate == intel_dp->max_link_rate && + lane_count == intel_dp->max_link_lane_count; +} +int intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp,int link_rate,u8 lane_count) {
@@ -471,24 +479,24 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, index =intel_dp_rate_index (intel_dp->common_rates, intel_dp->num_common_rates, link_rate); -if (index >0 ) { -if (intel_dp_is_edp (intel_dp) && - !intel_dp_can_link_train_fallback_for_edp (intel_dp, - intel_dp->common_rates[index -1 ], - lane_count)) { + +if (intel_dp_is_edp (intel_dp)) { +if (!intel_dp_uses_max_link_params (intel_dp, link_rate, + lane_count)) { + intel_dp->retry_with_max_link_params = true; +DRM_DEBUG_KMS ("Retrying Link training for eDP with max link parameters\n" ); +return 0 ; + }else if (!intel_dp_can_link_train_fallback_for_edp (intel_dp, + intel_dp->common_rates[index -1 ], + lane_count)) {DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" );return 0 ; } + } +if (index >0 ) { intel_dp->max_link_rate = intel_dp->common_rates[index -1 ]; intel_dp->max_link_lane_count = lane_count; }else if (lane_count >1 ) { -if (intel_dp_is_edp (intel_dp) && - !intel_dp_can_link_train_fallback_for_edp (intel_dp, -intel_dp_max_common_rate (intel_dp), - lane_count >>1 )) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); -return 0 ; - } intel_dp->max_link_rate =intel_dp_max_common_rate (intel_dp); intel_dp->max_link_lane_count = lane_count >>1 ; }else {
@@ -2028,7 +2036,8 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, limits.min_bpp =6 *3 ; limits.max_bpp =intel_dp_compute_bpp (intel_dp, pipe_config); -if (intel_dp_is_edp (intel_dp) && intel_dp->edp_dpcd[0 ] <DP_EDP_14 ) { +if ((intel_dp_is_edp (intel_dp) && intel_dp->edp_dpcd[0 ] <DP_EDP_14 ) || + intel_dp->retry_with_max_link_params) {/* * Use the maximum clock and number of lanes the eDP panel * advertizes being capable of. The eDP 1.3 and earlier panels
@@ -5432,6 +5441,8 @@ intel_dp_detect(struct drm_connector *connector,/* Initial max link rate */ intel_dp->max_link_rate =intel_dp_max_common_rate (intel_dp); + intel_dp->retry_with_max_link_params = false; + intel_dp->reset_link_params = false; }
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1327,6 +1327,9 @@ struct intel_dp {/* Display stream compression testing */ bool force_dsc_en; + +/* Some panels need max link params for link training */ +bool retry_with_max_link_params; };enum lspcon_vendor {
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915/dp: On link train failure on eDP, retry with max params first (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/dp: On link train failure on eDP, retry with max params first (rev2)
URL : https://patchwork.freedesktop.org/series/58975/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 58de6f859ee4 drm/i915/dp: On link train failure on eDP, retry with max params first -:65: WARNING:LONG_LINE: line over 100 characters #65: FILE: drivers/gpu/drm/i915/intel_dp.c:490: + intel_dp->common_rates[index - 1],
total: 0 errors, 1 warnings, 0 checks, 76 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/dp: On link train failure on eDP, retry with max params first (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: drm/i915/dp: On link train failure on eDP, retry with max params first (rev2)
URL : https://patchwork.freedesktop.org/series/58975/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5874 -> Patchwork_12685
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/58975/revisions/2/mbox/
Known issues
------------
Here are the changes found in Patchwork_12685 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]
* igt@i915_selftest@live_uncore:
- fi-skl-gvtdvm: PASS -> DMESG-FAIL [fdo#110210]
* igt@kms_busy@basic-flip-c:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-c:
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] +48
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: INCOMPLETE [fdo#108602] / [fdo#108744] -> PASS
* igt@i915_selftest@live_uncore:
- fi-ivb-3770: DMESG-FAIL [fdo#110210] -> PASS
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS +1
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
[fdo#110210]: https://bugs.freedesktop.org/show_bug.cgi?id=110210
Participating hosts (49 -> 45)
------------------------------
Missing (4): fi-kbl-soraka fi-ilk-m540 fi-bsw-cyan fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_5874 -> Patchwork_12685
CI_DRM_5874: a9040359beb75050c8a2f2e1b4dd07c621a7583c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4928: 014a6fa238322b497116b359cb92df1ce7fa8847 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12685: 58de6f859ee4277eeac01eabf18fdd06a3bb38cc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
58de6f859ee4 drm/i915/dp: On link train failure on eDP, retry with max params first
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12685/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/dp: On link train failure on eDP, retry with max params first (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: drm/i915/dp: On link train failure on eDP, retry with max params first (rev2)
URL : https://patchwork.freedesktop.org/series/58975/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5874_full -> Patchwork_12685_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12685_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_create@create-clear:
- shard-snb: PASS -> INCOMPLETE [fdo#105411]
* igt@gem_mmap_gtt@forked-big-copy:
- shard-iclb: PASS -> TIMEOUT [fdo#109673]
* igt@kms_atomic_transition@3x-modeset-transitions-nonblocking-fencing:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_busy@extended-modeset-hang-newfb-render-c:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#110222] +1
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-skl: PASS -> INCOMPLETE [fdo#104108]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: NOTRUN -> FAIL [fdo#105363]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-gtt:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +11
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-iclb: PASS -> FAIL [fdo#103167] +5
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-iclb: PASS -> FAIL [fdo#109247] +20
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-iclb: PASS -> FAIL [fdo#103375]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-f:
- shard-skl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +11
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: PASS -> FAIL [fdo#107815] +1
* igt@kms_plane_scaling@pipe-c-scaler-with-pixel-format:
- shard-glk: PASS -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: PASS -> SKIP [fdo#109441] +5
* igt@kms_psr@sprite_render:
- shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215]
* igt@kms_universal_plane@universal-plane-gen9-features-pipe-f:
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-iclb: PASS -> FAIL [fdo#104894] +1
* igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend:
- shard-apl: PASS -> FAIL [fdo#104894]
* igt@prime_nv_pcopy@test3_4:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] +17
* igt@prime_vgem@sync-bsd1:
- shard-skl: NOTRUN -> SKIP [fdo#109271] +121
* igt@tools_test@tools_test:
- shard-skl: PASS -> SKIP [fdo#109271]
#### Possible fixes ####
* igt@debugfs_test@read_all_entries_display_off:
- shard-skl: INCOMPLETE [fdo#104108] -> PASS +1
* igt@gem_eio@unwedge-stress:
- shard-snb: FAIL [fdo#109661] -> PASS
* igt@kms_atomic_transition@plane-all-modeset-transition-fencing:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: FAIL [fdo#105363] -> PASS
* igt@kms_flip@plain-flip-fb-recreate:
- shard-skl: FAIL [fdo#100368] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-glk: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt:
- shard-iclb: FAIL [fdo#103167] -> PASS +5
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-wc:
- shard-iclb: FAIL [fdo#105682] / [fdo#109247] -> PASS
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: FAIL [fdo#109247] -> PASS +6
* igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
- shard-glk: SKIP [fdo#109271] -> PASS
* igt@kms_plane_scaling@pipe-a-scaler-with-pixel-format:
- shard-glk: SKIP [fdo#109271] / [fdo#109278] -> PASS +1
* igt@kms_psr@dpms:
- shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: SKIP [fdo#109441] -> PASS +1
* igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
- shard-kbl: DMESG-FAIL [fdo#105763] -> PASS
* igt@kms_setmode@basic:
- shard-kbl: FAIL [fdo#99912] -> PASS
* igt@perf@short-reads:
- shard-kbl: FAIL [fdo#103183] -> PASS
#### Warnings ####
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: FAIL [fdo#110270] -> SKIP [fdo#109349]
### Piglit changes ###
#### Issues hit ####
* spec@arb_fragment_shader_interlock@arb_fragment_shader_interlock-image-load-store:
- pig-hsw-4770r: NOTRUN -> FAIL [fdo#109980]
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103183]: https://bugs.freedesktop.org/show_bug.cgi?id=103183
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#109980]: https://bugs.freedesktop.org/show_bug.cgi?id=109980
[fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
[fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
[fdo#110270]: https://bugs.freedesktop.org/show_bug.cgi?id=110270
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (9 -> 9)
------------------------------
Additional (1): pig-hsw-4770r
Missing (1): shard-hsw
Build changes
-------------
* Linux: CI_DRM_5874 -> Patchwork_12685
CI_DRM_5874: a9040359beb75050c8a2f2e1b4dd07c621a7583c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4928: 014a6fa238322b497116b359cb92df1ce7fa8847 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12685: 58de6f859ee4277eeac01eabf18fdd06a3bb38cc @ 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_12685/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx