| Message ID | 1490651090-4263-1-git-send-email-manasi.d.navare@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Jani, Should I just hold on to this until your patch series gets merged so I can rebase this on top of it? Regards Manasi On Mon, Mar 27, 2017 at 02:44:50PM -0700, Manasi Navare wrote: > Currently intel_dp_check_link_status() tries to retrain the link if > Clock recovery or Channel EQ for any of the lanes indicated by > intel_dp->lane_count is not set. However these values cached in intel_dp > structure can be stale if link training has failed for these values > during previous modeset. Or these values can get stale since we have > now re read the DPCD registers or it can be 0 in case of connected boot > case. > > This patch validates these values against the common_rates and max lane > count values. > > This is absolutely required incase the common_rates or max lane count > are now different due to link fallback. > > v2: > * Include the FIXME commnet inside the function (Ville Syrjala) > * Remove the redundant parenthesis (Ville Syrjala) > > Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 28 +++++++++++++++++++++++++--- > 1 file changed, 25 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index fd96a6c..d0ab307 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -295,6 +295,27 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp, > return -1; > } > > +static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp) > +{ > + int common_rates[DP_MAX_SUPPORTED_RATES]; > + int link_rate_index; > + > + /* FIXME: we need to synchronize the current link parameters with > + * hardware readout. Currently fast link training doesn't work > + * on boot-up. > + */ > + link_rate_index = intel_dp_link_rate_index(intel_dp, > + common_rates, > + intel_dp->link_rate); > + if (link_rate_index < 0) > + return false; > + if (!intel_dp->lane_count || > + intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)) > + return false; > + > + return true; > +} > + > int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, > int link_rate, uint8_t lane_count) > { > @@ -4224,9 +4245,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) > if (!to_intel_crtc(intel_encoder->base.crtc)->active) > return; > > - /* FIXME: we need to synchronize this sort of stuff with hardware > - * readout. Currently fast link training doesn't work on boot-up. */ > - if (!intel_dp->lane_count) > + /* Validate the cached values of intel_dp->link_rate and > + * intel_dp->lane_count before attempting to retrain. > + */ > + if (!intel_dp_link_params_is_valid(intel_dp)) > return; > > /* Retrain if Channel EQ or CR not ok */ > -- > 2.1.4 >
On Tue, 28 Mar 2017, Manasi Navare <manasi.d.navare@intel.com> wrote: > Jani, > > Should I just hold on to this until your patch series > gets merged so I can rebase this on top of it? I think I'd prefer that, especially so because I'm not sure that this patch does the right thing. Yes, this checks that the values are within bounds, but that they are within bounds doesn't make them any more valid for the current link if they are indeed stale! BR, Jani. > > Regards > Manasi > > > On Mon, Mar 27, 2017 at 02:44:50PM -0700, Manasi Navare wrote: >> Currently intel_dp_check_link_status() tries to retrain the link if >> Clock recovery or Channel EQ for any of the lanes indicated by >> intel_dp->lane_count is not set. However these values cached in intel_dp >> structure can be stale if link training has failed for these values >> during previous modeset. Or these values can get stale since we have >> now re read the DPCD registers or it can be 0 in case of connected boot >> case. >> >> This patch validates these values against the common_rates and max lane >> count values. >> >> This is absolutely required incase the common_rates or max lane count >> are now different due to link fallback. >> >> v2: >> * Include the FIXME commnet inside the function (Ville Syrjala) >> * Remove the redundant parenthesis (Ville Syrjala) >> >> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> >> Cc: Jani Nikula <jani.nikula@linux.intel.com> >> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> >> --- >> drivers/gpu/drm/i915/intel_dp.c | 28 +++++++++++++++++++++++++--- >> 1 file changed, 25 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index fd96a6c..d0ab307 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -295,6 +295,27 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp, >> return -1; >> } >> >> +static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp) >> +{ >> + int common_rates[DP_MAX_SUPPORTED_RATES]; >> + int link_rate_index; >> + >> + /* FIXME: we need to synchronize the current link parameters with >> + * hardware readout. Currently fast link training doesn't work >> + * on boot-up. >> + */ >> + link_rate_index = intel_dp_link_rate_index(intel_dp, >> + common_rates, >> + intel_dp->link_rate); >> + if (link_rate_index < 0) >> + return false; >> + if (!intel_dp->lane_count || >> + intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)) >> + return false; >> + >> + return true; >> +} >> + >> int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, >> int link_rate, uint8_t lane_count) >> { >> @@ -4224,9 +4245,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) >> if (!to_intel_crtc(intel_encoder->base.crtc)->active) >> return; >> >> - /* FIXME: we need to synchronize this sort of stuff with hardware >> - * readout. Currently fast link training doesn't work on boot-up. */ >> - if (!intel_dp->lane_count) >> + /* Validate the cached values of intel_dp->link_rate and >> + * intel_dp->lane_count before attempting to retrain. >> + */ >> + if (!intel_dp_link_params_is_valid(intel_dp)) >> return; >> >> /* Retrain if Channel EQ or CR not ok */ >> -- >> 2.1.4 >>
On Wed, Mar 29, 2017 at 10:29:24AM +0300, Jani Nikula wrote: > On Tue, 28 Mar 2017, Manasi Navare <manasi.d.navare@intel.com> wrote: > > Jani, > > > > Should I just hold on to this until your patch series > > gets merged so I can rebase this on top of it? > > I think I'd prefer that, especially so because I'm not sure that this > patch does the right thing. Yes, this checks that the values are within > bounds, but that they are within bounds doesn't make them any more valid > for the current link if they are indeed stale! Can they be stale and still be within the bounds somehow? That doesn't make much sense to me. Althogh the way we shrink the set of valid params doesn't make much sense to me either since we don't monotonically reduce the link bw. > > BR, > Jani. > > > > > > Regards > > Manasi > > > > > > On Mon, Mar 27, 2017 at 02:44:50PM -0700, Manasi Navare wrote: > >> Currently intel_dp_check_link_status() tries to retrain the link if > >> Clock recovery or Channel EQ for any of the lanes indicated by > >> intel_dp->lane_count is not set. However these values cached in intel_dp > >> structure can be stale if link training has failed for these values > >> during previous modeset. Or these values can get stale since we have > >> now re read the DPCD registers or it can be 0 in case of connected boot > >> case. > >> > >> This patch validates these values against the common_rates and max lane > >> count values. > >> > >> This is absolutely required incase the common_rates or max lane count > >> are now different due to link fallback. > >> > >> v2: > >> * Include the FIXME commnet inside the function (Ville Syrjala) > >> * Remove the redundant parenthesis (Ville Syrjala) > >> > >> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> > >> Cc: Jani Nikula <jani.nikula@linux.intel.com> > >> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> > >> --- > >> drivers/gpu/drm/i915/intel_dp.c | 28 +++++++++++++++++++++++++--- > >> 1 file changed, 25 insertions(+), 3 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > >> index fd96a6c..d0ab307 100644 > >> --- a/drivers/gpu/drm/i915/intel_dp.c > >> +++ b/drivers/gpu/drm/i915/intel_dp.c > >> @@ -295,6 +295,27 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp, > >> return -1; > >> } > >> > >> +static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp) > >> +{ > >> + int common_rates[DP_MAX_SUPPORTED_RATES]; > >> + int link_rate_index; > >> + > >> + /* FIXME: we need to synchronize the current link parameters with > >> + * hardware readout. Currently fast link training doesn't work > >> + * on boot-up. > >> + */ > >> + link_rate_index = intel_dp_link_rate_index(intel_dp, > >> + common_rates, > >> + intel_dp->link_rate); > >> + if (link_rate_index < 0) > >> + return false; > >> + if (!intel_dp->lane_count || > >> + intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)) > >> + return false; > >> + > >> + return true; > >> +} > >> + > >> int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, > >> int link_rate, uint8_t lane_count) > >> { > >> @@ -4224,9 +4245,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) > >> if (!to_intel_crtc(intel_encoder->base.crtc)->active) > >> return; > >> > >> - /* FIXME: we need to synchronize this sort of stuff with hardware > >> - * readout. Currently fast link training doesn't work on boot-up. */ > >> - if (!intel_dp->lane_count) > >> + /* Validate the cached values of intel_dp->link_rate and > >> + * intel_dp->lane_count before attempting to retrain. > >> + */ > >> + if (!intel_dp_link_params_is_valid(intel_dp)) > >> return; > >> > >> /* Retrain if Channel EQ or CR not ok */ > >> -- > >> 2.1.4 > >> > > -- > Jani Nikula, Intel Open Source Technology Center
On Wed, 29 Mar 2017, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > On Wed, Mar 29, 2017 at 10:29:24AM +0300, Jani Nikula wrote: >> On Tue, 28 Mar 2017, Manasi Navare <manasi.d.navare@intel.com> wrote: >> > Jani, >> > >> > Should I just hold on to this until your patch series >> > gets merged so I can rebase this on top of it? >> >> I think I'd prefer that, especially so because I'm not sure that this >> patch does the right thing. Yes, this checks that the values are within >> bounds, but that they are within bounds doesn't make them any more valid >> for the current link if they are indeed stale! > > Can they be stale and still be within the bounds somehow? Maybe not. Maybe I just don't follow. Perhaps the commit message deserves a better description of the cases where we hit the case. >> >> +static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp) Side note, it bugs me that the function name has a grammatical error. BR, Jani.
On Wed, Mar 29, 2017 at 03:11:46PM +0300, Jani Nikula wrote: > On Wed, 29 Mar 2017, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > > On Wed, Mar 29, 2017 at 10:29:24AM +0300, Jani Nikula wrote: > >> On Tue, 28 Mar 2017, Manasi Navare <manasi.d.navare@intel.com> wrote: > >> > Jani, > >> > > >> > Should I just hold on to this until your patch series > >> > gets merged so I can rebase this on top of it? > >> > >> I think I'd prefer that, especially so because I'm not sure that this > >> patch does the right thing. Yes, this checks that the values are within > >> bounds, but that they are within bounds doesn't make them any more valid > >> for the current link if they are indeed stale! > > > > Can they be stale and still be within the bounds somehow? > > Maybe not. Maybe I just don't follow. Perhaps the commit message > deserves a better description of the cases where we hit the case. > So the idea here is to avoid using higher values of link rate/lane count which are stale now due to an intermediate step of link rate fallback. That is why the values cached in intel_dp structure will not be within the bounds of common rates array and hence are termed as stale now. Is there any other way for validating the values cached in intel_dp structure? Since we dont zero them out on link failure, the driver can still mistaken them as valid which is what I am trying to avoid here through this patch. > >> >> +static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp) > > Side note, it bugs me that the function name has a grammatical error. > > Change it to intel_dp_link_params_are_valid()? Regards Manasi > BR, > Jani. > > > -- > Jani Nikula, Intel Open Source Technology Center
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index fd96a6c..d0ab307 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -295,6 +295,27 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp, return -1; } +static bool intel_dp_link_params_is_valid(struct intel_dp *intel_dp) +{ + int common_rates[DP_MAX_SUPPORTED_RATES]; + int link_rate_index; + + /* FIXME: we need to synchronize the current link parameters with + * hardware readout. Currently fast link training doesn't work + * on boot-up. + */ + link_rate_index = intel_dp_link_rate_index(intel_dp, + common_rates, + intel_dp->link_rate); + if (link_rate_index < 0) + return false; + if (!intel_dp->lane_count || + intel_dp->lane_count > intel_dp_max_lane_count(intel_dp)) + return false; + + return true; +} + int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, int link_rate, uint8_t lane_count) { @@ -4224,9 +4245,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) if (!to_intel_crtc(intel_encoder->base.crtc)->active) return; - /* FIXME: we need to synchronize this sort of stuff with hardware - * readout. Currently fast link training doesn't work on boot-up. */ - if (!intel_dp->lane_count) + /* Validate the cached values of intel_dp->link_rate and + * intel_dp->lane_count before attempting to retrain. + */ + if (!intel_dp_link_params_is_valid(intel_dp)) return; /* Retrain if Channel EQ or CR not ok */
Currently intel_dp_check_link_status() tries to retrain the link if Clock recovery or Channel EQ for any of the lanes indicated by intel_dp->lane_count is not set. However these values cached in intel_dp structure can be stale if link training has failed for these values during previous modeset. Or these values can get stale since we have now re read the DPCD registers or it can be 0 in case of connected boot case. This patch validates these values against the common_rates and max lane count values. This is absolutely required incase the common_rates or max lane count are now different due to link fallback. v2: * Include the FIXME commnet inside the function (Ville Syrjala) * Remove the redundant parenthesis (Ville Syrjala) Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)