Message ID | 1496954463-18038-1-git-send-email-manasi.d.navare@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Can this be merged? It has a r-b from Jani Nikula. On Thu, Jun 08, 2017 at 01:41:02PM -0700, Manasi Navare wrote: > This function now takes the link rate and lane ocunt to be validated > as an argument so that this can be used for validating even the > compliance test link parameters. > > Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> > Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index db51338..dd01ab8 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -322,19 +322,20 @@ static int intel_dp_common_len_rate_limit(struct intel_dp *intel_dp, > return 0; > } > > -static bool intel_dp_link_params_valid(struct intel_dp *intel_dp) > +static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate, > + uint8_t lane_count) > { > /* > * FIXME: we need to synchronize the current link parameters with > * hardware readout. Currently fast link training doesn't work on > * boot-up. > */ > - if (intel_dp->link_rate == 0 || > - intel_dp->link_rate > intel_dp->max_link_rate) > + if (link_rate == 0 || > + link_rate > intel_dp->max_link_rate) > return false; > > - if (intel_dp->lane_count == 0 || > - intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)) > + if (lane_count == 0 || > + lane_count > intel_dp_max_lane_count(intel_dp)) > return false; > > return true; > @@ -4260,7 +4261,8 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) > * Validate the cached values of intel_dp->link_rate and > * intel_dp->lane_count before attempting to retrain. > */ > - if (!intel_dp_link_params_valid(intel_dp)) > + if (!intel_dp_link_params_valid(intel_dp, intel_dp->link_rate, > + intel_dp->lane_count)) > return; > > /* Retrain if Channel EQ or CR not ok */ > -- > 2.1.4 >
On Mon, 12 Jun 2017, Manasi Navare <manasi.d.navare@intel.com> wrote: > Can this be merged? It has a r-b from Jani Nikula. Both pushed, sorry for the delay. BR, Jani. > > > On Thu, Jun 08, 2017 at 01:41:02PM -0700, Manasi Navare wrote: >> This function now takes the link rate and lane ocunt to be validated >> as an argument so that this can be used for validating even the >> compliance test link parameters. >> >> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> >> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> >> Cc: Jani Nikula <jani.nikula@linux.intel.com> >> Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com> >> --- >> drivers/gpu/drm/i915/intel_dp.c | 14 ++++++++------ >> 1 file changed, 8 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index db51338..dd01ab8 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -322,19 +322,20 @@ static int intel_dp_common_len_rate_limit(struct intel_dp *intel_dp, >> return 0; >> } >> >> -static bool intel_dp_link_params_valid(struct intel_dp *intel_dp) >> +static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate, >> + uint8_t lane_count) >> { >> /* >> * FIXME: we need to synchronize the current link parameters with >> * hardware readout. Currently fast link training doesn't work on >> * boot-up. >> */ >> - if (intel_dp->link_rate == 0 || >> - intel_dp->link_rate > intel_dp->max_link_rate) >> + if (link_rate == 0 || >> + link_rate > intel_dp->max_link_rate) >> return false; >> >> - if (intel_dp->lane_count == 0 || >> - intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)) >> + if (lane_count == 0 || >> + lane_count > intel_dp_max_lane_count(intel_dp)) >> return false; >> >> return true; >> @@ -4260,7 +4261,8 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) >> * Validate the cached values of intel_dp->link_rate and >> * intel_dp->lane_count before attempting to retrain. >> */ >> - if (!intel_dp_link_params_valid(intel_dp)) >> + if (!intel_dp_link_params_valid(intel_dp, intel_dp->link_rate, >> + intel_dp->lane_count)) >> return; >> >> /* Retrain if Channel EQ or CR not ok */ >> -- >> 2.1.4 >>
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index db51338..dd01ab8 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -322,19 +322,20 @@ static int intel_dp_common_len_rate_limit(struct intel_dp *intel_dp, return 0; } -static bool intel_dp_link_params_valid(struct intel_dp *intel_dp) +static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate, + uint8_t lane_count) { /* * FIXME: we need to synchronize the current link parameters with * hardware readout. Currently fast link training doesn't work on * boot-up. */ - if (intel_dp->link_rate == 0 || - intel_dp->link_rate > intel_dp->max_link_rate) + if (link_rate == 0 || + link_rate > intel_dp->max_link_rate) return false; - if (intel_dp->lane_count == 0 || - intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)) + if (lane_count == 0 || + lane_count > intel_dp_max_lane_count(intel_dp)) return false; return true; @@ -4260,7 +4261,8 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) * Validate the cached values of intel_dp->link_rate and * intel_dp->lane_count before attempting to retrain. */ - if (!intel_dp_link_params_valid(intel_dp)) + if (!intel_dp_link_params_valid(intel_dp, intel_dp->link_rate, + intel_dp->lane_count)) return; /* Retrain if Channel EQ or CR not ok */