[Intel-gfx] [PATCH 03/22] drm/i915 Call get_adjust_train() from clock recovery and channel eq

[Thulasimani, Sivakumar]

Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani at intel.com>

On 10/23/2015 3:31 PM, Ander Conselvan de Oliveira wrote:
> Move the call to intel_dp_get_adjust_train() out of
> intel_dp_update_link_train() and call it instead from the clock recovery
> and channel equalization features. A follow up patch will remove the DP
> register write from that function, so that it handles only the DPCD
> write.
>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_dp.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 0958cab..11f2385 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3645,15 +3645,13 @@ intel_dp_reset_link_train(struct intel_dp *intel_dp,
>   }
>   
>   static bool
> -intel_dp_update_link_train(struct intel_dp *intel_dp,
> -			   const uint8_t link_status[DP_LINK_STATUS_SIZE])
> +intel_dp_update_link_train(struct intel_dp *intel_dp)
>   {
>   	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
>   	struct drm_i915_private *dev_priv =
>   		to_i915(intel_dig_port->base.base.dev);
>   	int ret;
>   
> -	intel_get_adjust_train(intel_dp, link_status);
>   	intel_dp_set_signal_levels(intel_dp);
>   
>   	I915_WRITE(intel_dp->output_reg, intel_dp->DP);
> @@ -3801,7 +3799,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
>   		voltage = intel_dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK;
>   
>   		/* Update training set as requested by target */
> -		if (!intel_dp_update_link_train(intel_dp, link_status)) {
> +		intel_get_adjust_train(intel_dp, link_status);
> +		if (!intel_dp_update_link_train(intel_dp)) {
>   			DRM_ERROR("failed to update link training\n");
>   			break;
>   		}
> @@ -3888,7 +3887,8 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
>   		}
>   
>   		/* Update training set as requested by target */
> -		if (!intel_dp_update_link_train(intel_dp, link_status)) {
> +		intel_get_adjust_train(intel_dp, link_status);
> +		if (!intel_dp_update_link_train(intel_dp)) {
>   			DRM_ERROR("failed to update link training\n");
>   			break;
>   		}