[Intel-gfx] [PATCH 4/4 v2] drm/i915: Introduce a get_aux_send_ctl() vfunc

[Daniel Vetter]

On Tue, Jan 21, 2014 at 01:37:15PM +0000, Damien Lespiau wrote:
> We need a bit more flexibility here in the future, bits get shuffled
> around.
> 
> v2: more descriptive commit message (Jani Nikula)
> 
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>

Merged all to dinq, thanks for patches and review.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_dp.c  | 10 ++++++----
>  drivers/gpu/drm/i915/intel_drv.h |  8 ++++++++
>  2 files changed, 14 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 7faf364..8936298 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -488,10 +488,10 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
>  	}
>  
>  	while ((aux_clock_divider = intel_dp->get_aux_clock_divider(intel_dp, clock++))) {
> -		u32 send_ctl = i9xx_get_aux_send_ctl(intel_dp,
> -						     has_aux_irq,
> -						     send_bytes,
> -						     aux_clock_divider);
> +		u32 send_ctl = intel_dp->get_aux_send_ctl(intel_dp,
> +							  has_aux_irq,
> +							  send_bytes,
> +							  aux_clock_divider);
>  
>  		/* Must try at least 3 times according to DP spec */
>  		for (try = 0; try < 5; try++) {
> @@ -3682,6 +3682,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
>  	else
>  		intel_dp->get_aux_clock_divider = i9xx_get_aux_clock_divider;
>  
> +	intel_dp->get_aux_send_ctl = i9xx_get_aux_send_ctl;
> +
>  	/* 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_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 6aeb62a..85bda0e 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -494,6 +494,14 @@ struct intel_dp {
>  	struct intel_connector *attached_connector;
>  
>  	uint32_t (*get_aux_clock_divider)(struct intel_dp *dp, int index);
> +	/*
> +	 * This function returns the value we have to program the AUX_CTL
> +	 * register with to kick off an AUX transaction.
> +	 */
> +	uint32_t (*get_aux_send_ctl)(struct intel_dp *dp,
> +				     bool has_aux_irq,
> +				     int send_bytes,
> +				     uint32_t aux_clock_divider);
>  };
>  
>  struct intel_digital_port {
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch