Re: [PATCH 06/22] drm/i915: Create intel_dp->prepare_link_retrain() hook

Thulasimani, Sivakumar
2015-10-25T02:40:29Z

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

On 10/23/2015 3:31 PM, Ander Conselvan de Oliveira wrote:
> In order to prepare for a link training with DDI, the state machine
> would call intel_ddi_prepare_link_retrain(). To remove the dependency to
> the hardware information, replace that direct call with a callback.
>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 8 ++++----
> drivers/gpu/drm/i915/intel_dp.c | 3 +++
> drivers/gpu/drm/i915/intel_dp_link_training.c | 6 ++----
> drivers/gpu/drm/i915/intel_drv.h | 6 +++++-
> 4 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index a163741..80843d9 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2971,11 +2971,11 @@ void intel_ddi_pll_init(struct drm_device *dev)
> }
> }
>
> -void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder)
> +void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
> {
> - struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
> - struct intel_dp *intel_dp = &intel_dig_port->dp;
> - struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> + 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);
> enum port port = intel_dig_port->port;
> uint32_t val;
> bool wait = false;
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 4b88823..5b04ade 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5731,6 +5731,9 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
> else
> intel_dp->get_aux_send_ctl = i9xx_get_aux_send_ctl;
>
> + if (HAS_DDI(dev))
> + intel_dp->prepare_link_retrain = intel_ddi_prepare_link_retrain;
> +
> /* Preserve the current hw state. */
> intel_dp->DP = I915_READ(intel_dp->output_reg);
> intel_dp->attached_connector = intel_connector;
> diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
> index 53f9c14..bb036d5 100644
> --- a/drivers/gpu/drm/i915/intel_dp_link_training.c
> +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
> @@ -108,16 +108,14 @@ intel_dp_update_link_train(struct intel_dp *intel_dp)
> static void
> intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
> {
> - struct drm_encoder *encoder = &dp_to_dig_port(intel_dp)->base.base;
> - struct drm_device *dev = encoder->dev;
> int i;
> uint8_t voltage;
> int voltage_tries, loop_tries;
> uint8_t link_config[2];
> uint8_t link_bw, rate_select;
>
> - if (HAS_DDI(dev))
> - intel_ddi_prepare_link_retrain(encoder);
> + if (intel_dp->prepare_link_retrain)
> + intel_dp->prepare_link_retrain(intel_dp);
>
> intel_dp_compute_rate(intel_dp, intel_dp->link_rate,
> &link_bw, &rate_select);
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 25ac5d2..1c2a8ed 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -784,6 +784,10 @@ struct intel_dp {
> bool has_aux_irq,
> int send_bytes,
> uint32_t aux_clock_divider);
> +
> + /* This is called before a link training is starterd */
> + void (*prepare_link_retrain)(struct intel_dp *intel_dp);
> +
> bool train_set_valid;
>
> /* Displayport compliance testing */
> @@ -988,7 +992,7 @@ void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc);
> bool intel_ddi_pll_select(struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state);
> void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
> -void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder);
> +void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);
> bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
> void intel_ddi_fdi_disable(struct drm_crtc *crtc);
> void intel_ddi_get_config(struct intel_encoder *encoder,