diff mbox

[2/2] drm/i915: force link training when requested by Sink

Message ID B9E6BA090016E748A0B4047CFFA99C320864936B@BGSMSX101.gar.corp.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Shubhangi Shrivastava Nov. 17, 2015, 9:12 a.m. UTC
Hi Daniel,

Is something else required for this patch series (2 patches) to be merged?

Thanks and Regards,
Shubhangi Shrivastava.

-----Original Message-----
From: Jindal, Sonika 
Sent: Thursday, November 5, 2015 10:36 AM
To: Shrivastava, Shubhangi <shubhangi.shrivastava@intel.com>; intel-gfx@lists.freedesktop.org
Cc: Shrivastava, Shubhangi <shubhangi.shrivastava@intel.com>
Subject: RE: [Intel-gfx] [PATCH 2/2] drm/i915: force link training when requested by Sink

Looks good to me.
Reviewed-by: Sonika Jindal <sonika.jindal@intel.com

-----Original Message-----
From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of Shubhangi Shrivastava
Sent: Wednesday, October 14, 2015 2:57 PM
To: intel-gfx@lists.freedesktop.org
Cc: Shrivastava, Shubhangi
Subject: [Intel-gfx] [PATCH 2/2] drm/i915: force link training when requested by Sink

Compliance test 4.3.1.11 requires source to perform link training always if the automated test requests for it. This patch enforces this requirement.

Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Shubhangi Shrivastava <shubhangi.shrivastava@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--
2.6.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Comments

Daniel Vetter Nov. 17, 2015, 3:11 p.m. UTC | #1
On Tue, Nov 17, 2015 at 09:12:58AM +0000, Shrivastava, Shubhangi wrote:
> Hi Daniel,
> 
> Is something else required for this patch series (2 patches) to be merged?

Me coming back from vacation ;-) Both patches applied to dinq.

Aside: The test request tracking seems a bit too much ad-hoc. But I guess
we can only clean that up once the entire hpd handling mess is sorted out.
-Daniel

> 
> Thanks and Regards,
> Shubhangi Shrivastava.
> 
> -----Original Message-----
> From: Jindal, Sonika 
> Sent: Thursday, November 5, 2015 10:36 AM
> To: Shrivastava, Shubhangi <shubhangi.shrivastava@intel.com>; intel-gfx@lists.freedesktop.org
> Cc: Shrivastava, Shubhangi <shubhangi.shrivastava@intel.com>
> Subject: RE: [Intel-gfx] [PATCH 2/2] drm/i915: force link training when requested by Sink
> 
> Looks good to me.
> Reviewed-by: Sonika Jindal <sonika.jindal@intel.com
> 
> -----Original Message-----
> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of Shubhangi Shrivastava
> Sent: Wednesday, October 14, 2015 2:57 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Shrivastava, Shubhangi
> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: force link training when requested by Sink
> 
> Compliance test 4.3.1.11 requires source to perform link training always if the automated test requests for it. This patch enforces this requirement.
> 
> Signed-off-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
> Signed-off-by: Shubhangi Shrivastava <shubhangi.shrivastava@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7bc75ef..3c7fc58 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4466,7 +4466,9 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
>  			DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
>  	}
>  
> -	if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
> +	/* 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);
> --
> 2.6.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7bc75ef..3c7fc58 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4466,7 +4466,9 @@  intel_dp_check_link_status(struct intel_dp *intel_dp)
 			DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
 	}
 
-	if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
+	/* 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);