Attachment 102864 Details for Bug 73037 – Patch for check_link_status()

Patch for check_link_status()

0009-drm-i915-Update-intel_dp_check_link_status-for-Displ.patch (text/plain), 2.96 KB, created by Todd Previte on 2014-07-15 17:18:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Previte

Created: 2014-07-15 17:18:25 UTC

Size: 2.96 KB

patch

obsolete

>From ae4b78a429eee5796624e1c0040d308b3a84ed52 Mon Sep 17 00:00:00 2001
>From: Todd Previte <tprevite@gmail.com>
>Date: Mon, 14 Jul 2014 11:50:10 -0700
>Subject: [PATCH 09/12] drm/i915: Update intel_dp_check_link_status() for
> Displayport compliance testing
>
>Move the DPCD read to the top and check for an interrupt from the sink to catch
>Displayport automated testing requests necessary to support Displayport compliance
>testing. The checks for active connectors and link status are moved below the
>check for the interrupt.
>
>Adds a check at the top to verify that the device is connected. This is necessary
>for DP compliance testing to ensure that test requests are captured and acknowledged.
>If a test request is present during a connected->disconnected transition,
>the test code will attempt to execute even though the connection has been disabled,
>resulting in a faied test.
>
>Signed-off-by: Todd Previte <tprevite@gmail.com>
>---
> drivers/gpu/drm/i915/intel_dp.c | 32 ++++++++++++++++++--------------
> 1 file changed, 18 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 1c6ee34..65830e9 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -3600,22 +3600,13 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
> 	u8 sink_irq_vector;
> 	u8 link_status[DP_LINK_STATUS_SIZE];
> 
>-	/* FIXME: This access isn't protected by any locks. */
>-	if (!intel_encoder->connectors_active)
>-		return;
>-
>-	if (WARN_ON(!intel_encoder->base.crtc))
>+	/* Bail if not connected */
>+	if (intel_dp->attached_connector->base.status != connector_status_connected)
> 		return;
> 
>-	/* Try to read receiver status if the link appears to be up */
>-	if (!intel_dp_get_link_status(intel_dp, link_status)) {
>-		return;
>-	}
>-
>-	/* Now read the DPCD to see if it's actually running */
>-	if (!intel_dp_get_dpcd(intel_dp)) {
>+	/* Attempt to read the DPCD */
>+	if (!intel_dp_get_dpcd(intel_dp))
> 		return;
>-	}
> 
> 	/* Try to read the source of the interrupt */
> 	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 &&
>@@ -3625,12 +3616,25 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
> 				   DP_DEVICE_SERVICE_IRQ_VECTOR,
> 				   sink_irq_vector);
> 
>-		if (sink_irq_vector & DP_AUTOMATED_TEST_REQUEST)
>+		if (sink_irq_vector & DP_AUTOMATED_TEST_REQUEST) {
>+			DRM_DEBUG_KMS("Displayport: Received automated test request\n");
> 			intel_dp_handle_test_request(intel_dp);
>+		}
> 		if (sink_irq_vector & (DP_CP_IRQ | DP_SINK_SPECIFIC_IRQ))
> 			DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
> 	}
> 
>+	/* FIXME: This access isn't protected by any locks. */
>+	if (!intel_encoder->connectors_active)
>+		return;
>+
>+	if (WARN_ON(!intel_encoder->base.crtc))
>+		return;
>+
>+	/* Try to read receiver status if the link appears to be up */
>+	if (!intel_dp_get_link_status(intel_dp, link_status))
>+		return;
>+
> 	if (!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);
>-- 
>1.9.1
>

Actions: View

Attachments on bug 73037: 91317 | 94745 | 101717 | 102179 | 102863 | 102864 | 102963

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.