diff mbox

[2/4] drm/i915/dp: Switch to using the DRM function for reading DP link status

Message ID 1470280061-640-3-git-send-email-dhinakaran.pandiyan@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dhinakaran Pandiyan Aug. 4, 2016, 3:07 a.m. UTC 
Since a DRM function that reads link DP link status is available, let's
use that instead of the i915 clone.

Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c               | 15 +++------------
 drivers/gpu/drm/i915/intel_dp_link_training.c | 11 ++++++++---
 drivers/gpu/drm/i915/intel_drv.h              |  2 --
 3 files changed, 11 insertions(+), 17 deletions(-)

Comments

Chris Wilson Aug. 4, 2016, 3:11 a.m. UTC | #1 
On Wed, Aug 03, 2016 at 08:07:39PM -0700, Dhinakaran Pandiyan wrote:
> Since a DRM function that reads link DP link status is available, let's
> use that instead of the i915 clone.
> 
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c               | 15 +++------------
>  drivers/gpu/drm/i915/intel_dp_link_training.c | 11 ++++++++---
>  drivers/gpu/drm/i915/intel_drv.h              |  2 --
>  3 files changed, 11 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 3ca33bd..c5c0201 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2863,17 +2863,6 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder)
>  	chv_phy_post_pll_disable(encoder);
>  }
>  
> -/*
> - * Fetch AUX CH registers 0x202 - 0x207 which contain
> - * link status information
> - */
> -bool
> -intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE])
> -{
> -	return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status,
> -				DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE;

Or just wrap it here since you add the same code everywhere, and don't
care what the invalid length actually is.
-Chris
Ville Syrjälä Aug. 4, 2016, 5:48 a.m. UTC | #2 
On Thu, Aug 04, 2016 at 04:11:06AM +0100, Chris Wilson wrote:
> On Wed, Aug 03, 2016 at 08:07:39PM -0700, Dhinakaran Pandiyan wrote:
> > Since a DRM function that reads link DP link status is available, let's
> > use that instead of the i915 clone.
> > 
> > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_dp.c               | 15 +++------------
> >  drivers/gpu/drm/i915/intel_dp_link_training.c | 11 ++++++++---
> >  drivers/gpu/drm/i915/intel_drv.h              |  2 --
> >  3 files changed, 11 insertions(+), 17 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 3ca33bd..c5c0201 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -2863,17 +2863,6 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder)
> >  	chv_phy_post_pll_disable(encoder);
> >  }
> >  
> > -/*
> > - * Fetch AUX CH registers 0x202 - 0x207 which contain
> > - * link status information
> > - */
> > -bool
> > -intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE])
> > -{
> > -	return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status,
> > -				DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE;
> 
> Or just wrap it here since you add the same code everywhere, and don't
> care what the invalid length actually is.

I don't think anyone cares actually, and I can't really imagine anyone
being happy with a partial link status block. So might be a good idea
to just change drm_dp_dpcd_read_link_status() to return success vs.
failure only.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 3ca33bd..c5c0201 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2863,17 +2863,6 @@  static void chv_dp_post_pll_disable(struct intel_encoder *encoder)
 	chv_phy_post_pll_disable(encoder);
 }
 
-/*
- * Fetch AUX CH registers 0x202 - 0x207 which contain
- * link status information
- */
-bool
-intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE])
-{
-	return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status,
-				DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE;
-}
-
 /* These are source-specific values. */
 uint8_t
 intel_dp_voltage_max(struct intel_dp *intel_dp)
@@ -3869,10 +3858,12 @@  intel_dp_check_link_status(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];
+	int len;
 
 	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
 
-	if (!intel_dp_get_link_status(intel_dp, link_status)) {
+	len = drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status);
+	if (len != DP_LINK_STATUS_SIZE) {
 		DRM_ERROR("Failed to get link status\n");
 		return;
 	}
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
index 60fb39c..c0a858d 100644
--- a/drivers/gpu/drm/i915/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
@@ -107,7 +107,7 @@  intel_dp_update_link_train(struct intel_dp *intel_dp)
 static void
 intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
 {
-	int i;
+	int i, len;
 	uint8_t voltage;
 	int voltage_tries, loop_tries;
 	uint8_t link_config[2];
@@ -150,7 +150,9 @@  intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
 		drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
-		if (!intel_dp_get_link_status(intel_dp, link_status)) {
+
+		len = drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status);
+		if (len != DP_LINK_STATUS_SIZE) {
 			DRM_ERROR("failed to get link status\n");
 			break;
 		}
@@ -235,6 +237,7 @@  intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 	bool channel_eq = false;
 	int tries, cr_tries;
 	u32 training_pattern;
+	int len;
 
 	training_pattern = intel_dp_training_pattern(intel_dp);
 
@@ -258,7 +261,9 @@  intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 		}
 
 		drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
-		if (!intel_dp_get_link_status(intel_dp, link_status)) {
+
+		len = drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status);
+		if (len != DP_LINK_STATUS_SIZE) {
 			DRM_ERROR("failed to get link status\n");
 			break;
 		}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index e74d851..87069ba 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1403,8 +1403,6 @@  intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing);
 void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock,
 			   uint8_t *link_bw, uint8_t *rate_select);
 bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);
-bool
-intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE]);
 
 static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
 {