| Message ID | 20180117192149.17760-4-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 17, 2018 at 07:21:48PM +0000, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > intel_dp->channel_eq_status is used in exactly one function, and we > don't need it to persist between calls. So just go back to using a > local variable instead. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/intel_dp_link_training.c | 6 +++--- > drivers/gpu/drm/i915/intel_drv.h | 1 - > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c > index 05907fa8a553..1314f5d87d7d 100644 > --- a/drivers/gpu/drm/i915/intel_dp_link_training.c > +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c > @@ -248,6 +248,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > int tries; > u32 training_pattern; > uint8_t link_status[DP_LINK_STATUS_SIZE]; > + bool channel_eq = false; > > training_pattern = intel_dp_training_pattern(intel_dp); > > @@ -259,7 +260,6 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > return false; > } > > - intel_dp->channel_eq_status = false; > for (tries = 0; tries < 5; tries++) { > > drm_dp_link_train_channel_eq_delay(intel_dp->dpcd); > @@ -279,7 +279,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > > if (drm_dp_channel_eq_ok(link_status, > intel_dp->lane_count)) { > - intel_dp->channel_eq_status = true; > + channel_eq = true; > DRM_DEBUG_KMS("Channel EQ done. DP Training " > "successful\n"); > break; > @@ -301,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > > intel_dp_set_idle_link_train(intel_dp); > > - return intel_dp->channel_eq_status; > + return channel_eq; > > } > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index ddf28a442cd7..1d018869ad02 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1045,7 +1045,6 @@ struct intel_dp { > bool link_mst; > bool has_audio; > bool detect_done; > - bool channel_eq_status; > bool reset_link_params; > uint8_t dpcd[DP_RECEIVER_CAP_SIZE]; > uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE]; > -- > 2.13.6 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by: Lyude Paul <lyude@redhat.com> On Wed, 2018-01-17 at 21:21 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > intel_dp->channel_eq_status is used in exactly one function, and we > don't need it to persist between calls. So just go back to using a > local variable instead. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_dp_link_training.c | 6 +++--- > drivers/gpu/drm/i915/intel_drv.h | 1 - > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c > b/drivers/gpu/drm/i915/intel_dp_link_training.c > index 05907fa8a553..1314f5d87d7d 100644 > --- a/drivers/gpu/drm/i915/intel_dp_link_training.c > +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c > @@ -248,6 +248,7 @@ intel_dp_link_training_channel_equalization(struct > intel_dp *intel_dp) > int tries; > u32 training_pattern; > uint8_t link_status[DP_LINK_STATUS_SIZE]; > + bool channel_eq = false; > > training_pattern = intel_dp_training_pattern(intel_dp); > > @@ -259,7 +260,6 @@ intel_dp_link_training_channel_equalization(struct > intel_dp *intel_dp) > return false; > } > > - intel_dp->channel_eq_status = false; > for (tries = 0; tries < 5; tries++) { > > drm_dp_link_train_channel_eq_delay(intel_dp->dpcd); > @@ -279,7 +279,7 @@ intel_dp_link_training_channel_equalization(struct > intel_dp *intel_dp) > > if (drm_dp_channel_eq_ok(link_status, > intel_dp->lane_count)) { > - intel_dp->channel_eq_status = true; > + channel_eq = true; > DRM_DEBUG_KMS("Channel EQ done. DP Training " > "successful\n"); > break; > @@ -301,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct > intel_dp *intel_dp) > > intel_dp_set_idle_link_train(intel_dp); > > - return intel_dp->channel_eq_status; > + return channel_eq; > > } > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index ddf28a442cd7..1d018869ad02 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1045,7 +1045,6 @@ struct intel_dp { > bool link_mst; > bool has_audio; > bool detect_done; > - bool channel_eq_status; > bool reset_link_params; > uint8_t dpcd[DP_RECEIVER_CAP_SIZE]; > uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
On Thu, Jan 18, 2018 at 10:59:04PM -0800, Rodrigo Vivi wrote: > On Wed, Jan 17, 2018 at 07:21:48PM +0000, Ville Syrjala wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > intel_dp->channel_eq_status is used in exactly one function, and we > > don't need it to persist between calls. So just go back to using a > > local variable instead. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Manasi Navare <manasi.d.navare@intel.com> > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > --- > > drivers/gpu/drm/i915/intel_dp_link_training.c | 6 +++--- > > drivers/gpu/drm/i915/intel_drv.h | 1 - > > 2 files changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c > > index 05907fa8a553..1314f5d87d7d 100644 > > --- a/drivers/gpu/drm/i915/intel_dp_link_training.c > > +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c > > @@ -248,6 +248,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > > int tries; > > u32 training_pattern; > > uint8_t link_status[DP_LINK_STATUS_SIZE]; > > + bool channel_eq = false; > > > > training_pattern = intel_dp_training_pattern(intel_dp); > > > > @@ -259,7 +260,6 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > > return false; > > } > > > > - intel_dp->channel_eq_status = false; > > for (tries = 0; tries < 5; tries++) { > > > > drm_dp_link_train_channel_eq_delay(intel_dp->dpcd); > > @@ -279,7 +279,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > > > > if (drm_dp_channel_eq_ok(link_status, > > intel_dp->lane_count)) { > > - intel_dp->channel_eq_status = true; > > + channel_eq = true; > > DRM_DEBUG_KMS("Channel EQ done. DP Training " > > "successful\n"); > > break; > > @@ -301,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) > > > > intel_dp_set_idle_link_train(intel_dp); > > > > - return intel_dp->channel_eq_status; > > + return channel_eq; > > > > } > > > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > > index ddf28a442cd7..1d018869ad02 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -1045,7 +1045,6 @@ struct intel_dp { > > bool link_mst; > > bool has_audio; > > bool detect_done; > > - bool channel_eq_status; > > bool reset_link_params; > > uint8_t dpcd[DP_RECEIVER_CAP_SIZE]; > > uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE]; > > -- > > 2.13.6 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c index 05907fa8a553..1314f5d87d7d 100644 --- a/drivers/gpu/drm/i915/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c @@ -248,6 +248,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) int tries; u32 training_pattern; uint8_t link_status[DP_LINK_STATUS_SIZE]; + bool channel_eq = false; training_pattern = intel_dp_training_pattern(intel_dp); @@ -259,7 +260,6 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) return false; } - intel_dp->channel_eq_status = false; for (tries = 0; tries < 5; tries++) { drm_dp_link_train_channel_eq_delay(intel_dp->dpcd); @@ -279,7 +279,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) if (drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) { - intel_dp->channel_eq_status = true; + channel_eq = true; DRM_DEBUG_KMS("Channel EQ done. DP Training " "successful\n"); break; @@ -301,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) intel_dp_set_idle_link_train(intel_dp); - return intel_dp->channel_eq_status; + return channel_eq; } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index ddf28a442cd7..1d018869ad02 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1045,7 +1045,6 @@ struct intel_dp { bool link_mst; bool has_audio; bool detect_done; - bool channel_eq_status; bool reset_link_params; uint8_t dpcd[DP_RECEIVER_CAP_SIZE]; uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];