drm/i915: intel_dp_link_is_valid() should only return status of link
Subsystems (2)
PATCH v3 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, link training is performed outside the function else previously trained link is retained.
This gives us flexibility of checking whether link is valid and training it independently.
v3:
* Removed some unnecessary DEBUG prints
* Optimized the conditional checking (Dhinakaran Pandiyan) v2:
* Changed the function name from intel_dp_check_link_status() to intel_dp_link_is_valid() (Lukas Wunner)
* Checks for CRTC and active CRTC are moved outside the intel_dp_link_is_valid() function (Rodrigo Vivi)
--- drivers/gpu/drm/i915/intel_dp.c | 53 ++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +34 -19
@@ -3881,36 +3881,32 @@ 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_DEBUG_KMS ("Channel EQ or CR not ok, need to retrain\n" ); +return false; + } -if (!to_intel_crtc (intel_encoder->base.crtc)->active) -return ; +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:
@@ -3928,6 +3924,8 @@ static bool intel_dp_short_pulse(struct intel_dp *intel_dp) {struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct intel_encoder *intel_encoder = &intel_dig_port->base;u8 sink_irq_vector =0 ;u8 old_sink_count = intel_dp->sink_count;bool ret;
@@ -3968,8 +3966,17 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } +/* Do not train the link if there is no crtc */ +if (!intel_encoder->base.crtc || + !to_intel_crtc (intel_encoder->base.crtc)->active) +return true; +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;
@@ -4298,8 +4305,16 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)* check links status, there has been known issues of * link loss triggerring long pulse!!!! */ +/* Do not train the link if there is no crtc */ +if (!intel_encoder->base.crtc || + !to_intel_crtc (intel_encoder->base.crtc)->active) + goto out; +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_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 (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915: intel_dp_link_is_valid() should only return status of link (rev3)
URL : https://patchwork.freedesktop.org/series/9737/
State : failure
== Summary ==
Series 9737v3 drm/i915: intel_dp_link_is_valid() should only return status of link
http://patchwork.freedesktop.org/api/1.0/series/9737/revisions/3/mbox
Test kms_cursor_legacy:
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (ro-byt-n2820)
pass -> FAIL (ro-bdw-i5-5250u)
Subgroup basic-flip-vs-cursor-varying-size:
pass -> FAIL (ro-bdw-i5-5250u)
pass -> DMESG-FAIL (fi-skl-i7-6700k)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (ro-bdw-i7-5600u)
dmesg-warn -> SKIP (ro-bdw-i5-5250u)
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-hsw-i7-4770k)
skip -> DMESG-WARN (ro-bdw-i5-5250u)
Subgroup suspend-read-crc-pipe-c:
skip -> DMESG-WARN (ro-bdw-i5-5250u)fi-hsw-i7-4770k total:207 pass:186 dwarn:0 dfail:0 fail:0 skip:20 fi-kbl-qkkr total:244 pass:185 dwarn:29 dfail:0 fail:3 skip:27 fi-skl-i7-6700k total:244 pass:208 dwarn:4 dfail:2 fail:2 skip:28 fi-snb-i7-2600 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 ro-bdw-i5-5250u total:240 pass:218 dwarn:3 dfail:0 fail:2 skip:17 ro-bdw-i7-5600u total:240 pass:207 dwarn:0 dfail:0 fail:1 skip:32 ro-bsw-n3050 total:240 pass:195 dwarn:0 dfail:0 fail:3 skip:42 ro-byt-n2820 total:240 pass:198 dwarn:0 dfail:0 fail:2 skip:40 ro-hsw-i3-4010u total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-hsw-i7-4770r total:240 pass:185 dwarn:0 dfail:0 fail:0 skip:55 ro-ilk1-i5-650 total:235 pass:173 dwarn:0 dfail:0 fail:2 skip:60 ro-ivb-i7-3770 total:240 pass:205 dwarn:0 dfail:0 fail:0 skip:35 ro-ivb2-i7-3770 total:240 pass:209 dwarn:0 dfail:0 fail:0 skip:31 ro-skl3-i5-6260u total:240 pass:222 dwarn:0 dfail:0 fail:4 skip:14
Results at /archive/results/CI_IGT_test/RO_Patchwork_1859/
3612906 drm-intel-nightly: 2016y-08m-12d-15h-08m-02s UTC integration manifest b41a36b 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