drm/i915: intel_dp_link_is_valid() should only return status of link
Subsystems (2)
PATCH 1/1 drm/i915: intel_dp_link_is_valid() should only return status of link
Intel_dp_link_is_valid() function reads the Link status registers and returns a boolean to indicate link is valid or not. If the link has lost lock and is not valid any more, it is retrained outside the function else no previously trained link is retained.
v2: Changed the function name from intel_dp_check_link_status() to intel_dp_link_is_valid() (Lukas Wunner)
--- drivers/gpu/drm/i915/intel_dp.c | 44 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +25 -19
@@ -3862,36 +3862,34 @@ go_again:return -EINVAL ; } -static void -intel_dp_check_link_status (struct intel_dp *intel_dp) +static bool +intel_dp_link_is_valid (struct intel_dp *intel_dp) { -struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base;struct drm_device *dev =intel_dp_to_dev (intel_dp);u8 link_status[DP_LINK_STATUS_SIZE ];WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex));if (!intel_dp_get_link_status (intel_dp, link_status)) { -DRM_ERROR ("Failed to get link status\n" ); -return ; +DRM_DEBUG_KMS ("Failed to get link status\n" ); +return false; } -if (!intel_encoder->base.crtc) -return ; +/* Check if the link is valid by reading the bits of Link status +* registers +*/ +if (!drm_dp_channel_eq_ok (link_status, intel_dp->lane_count) || + !drm_dp_clock_recovery_ok (link_status, intel_dp->lane_count)) { +DRM_DEBUG_KMS ("Channel EQ or CR not ok, need to retrain\n" ); +return false; + } -if (!to_intel_crtc (intel_encoder->base.crtc)->active) -return ; +DRM_DEBUG_KMS ("Link is good, no need to retrain\n" ); +return true; -/* if link training is requested we should perform it always */ -if ((intel_dp->compliance_test_type ==DP_TEST_LINK_TRAINING ) || - (!drm_dp_channel_eq_ok (link_status, intel_dp->lane_count))) { -DRM_DEBUG_KMS ("%s: channel EQ not ok, retraining\n" , - intel_encoder->base.name); -intel_dp_start_link_train (intel_dp); -intel_dp_stop_link_train (intel_dp); - } } +/* * According to DP spec * 5.1.2:
@@ -3949,7 +3947,11 @@ intel_dp_short_pulse(struct intel_dp *intel_dp) }drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); -intel_dp_check_link_status (intel_dp); +if (!intel_dp_link_is_valid (intel_dp) || + intel_dp->compliance_test_type ==DP_TEST_LINK_TRAINING ) { +intel_dp_start_link_train (intel_dp); +intel_dp_stop_link_train (intel_dp); + }drm_modeset_unlock (&dev->mode_config.connection_mutex);return true;
@@ -4270,7 +4272,11 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)* link loss triggerring long pulse!!!! */ drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); -intel_dp_check_link_status (intel_dp); +if (!intel_dp_link_is_valid (intel_dp) || + intel_dp->compliance_test_type ==DP_TEST_LINK_TRAINING ) { +intel_dp_start_link_train (intel_dp); +intel_dp_stop_link_train (intel_dp); + }drm_modeset_unlock (&dev->mode_config.connection_mutex); goto out; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for drm/i915: intel_dp_link_is_valid() should only return status of link
== Series Details ==
== Series Details ==
Series: drm/i915: intel_dp_link_is_valid() should only return status of link
URL : https://patchwork.freedesktop.org/series/9737/
State : failure
== Summary ==
Series 9737v1 drm/i915: intel_dp_link_is_valid() should only return status of link
http://patchwork.freedesktop.org/api/1.0/series/9737/revisions/1/mbox
Test drv_module_reload_basic:
pass -> DMESG-WARN (ro-bdw-i7-5600u)
pass -> INCOMPLETE (ro-bdw-i7-5557U)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> DMESG-WARN (ro-skl3-i5-6260u)ro-bdw-i5-5250u total:237 pass:207 dwarn:1 dfail:1 fail:4 skip:24 ro-bdw-i7-5557U total:29 pass:23 dwarn:0 dfail:0 fail:0 skip:5 ro-bdw-i7-5600u total:237 pass:192 dwarn:1 dfail:1 fail:4 skip:39 ro-bsw-n3050 total:237 pass:170 dwarn:0 dfail:0 fail:5 skip:42 ro-byt-n2820 total:237 pass:183 dwarn:0 dfail:1 fail:7 skip:46 ro-hsw-i3-4010u total:237 pass:200 dwarn:0 dfail:1 fail:4 skip:32 ro-hsw-i7-4770r total:237 pass:200 dwarn:0 dfail:1 fail:4 skip:32 ro-ilk-i7-620lm total:237 pass:160 dwarn:0 dfail:1 fail:5 skip:71 ro-ilk1-i5-650 total:232 pass:160 dwarn:0 dfail:1 fail:5 skip:66 ro-ivb-i7-3770 total:237 pass:191 dwarn:0 dfail:1 fail:4 skip:41 ro-skl3-i5-6260u total:237 pass:210 dwarn:2 dfail:1 fail:4 skip:20 ro-snb-i7-2620M total:237 pass:182 dwarn:0 dfail:1 fail:5 skip:49
fi-kbl-qkkr failed to connect after reboot
fi-skl-i5-6260u failed to connect after reboot
fi-skl-i7-6700k failed to connect after reboot
fi-snb-i7-2600 failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1469/
e549c0b drm-intel-nightly: 2016y-07m-11d-12h-49m-29s UTC integration manifest f65b9f3 drm/i915: intel_dp_link_is_valid() should only return status of link
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx