[Intel-gfx] [PATCH v2 1/2] drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming

[Rodrigo Vivi]

On Wed, Oct 04, 2017 at 08:09:21PM +0000, James Ausmus wrote:
> Rename DP_AUX_CH_CTL_TIME_OUT_1600us to DP_AUX_CH_CTL_TIME_OUT_MAX, as
> the meaning of the (3 << 26) value varies per platform, but it's always the
> maximum timeout for that platform. Pre-CNL it means 1600us, and for CNL
> it means 3200us.

Yeap...

> 
> v2:
> -Split in to two patches (Rodrigo)
> 
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: James Ausmus <james.ausmus at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h | 2 +-
>  drivers/gpu/drm/i915/intel_dp.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 39ad9327e2a0..0324e0ca7597 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -5239,7 +5239,7 @@ enum {
>  #define   DP_AUX_CH_CTL_TIME_OUT_400us	    (0 << 26)
>  #define   DP_AUX_CH_CTL_TIME_OUT_600us	    (1 << 26)
>  #define   DP_AUX_CH_CTL_TIME_OUT_800us	    (2 << 26)
> -#define   DP_AUX_CH_CTL_TIME_OUT_1600us	    (3 << 26)
> +#define   DP_AUX_CH_CTL_TIME_OUT_MAX	    (3 << 26) /* Varies per platform */

makes sense for me...

I was going to complain about the tab+spaces but I notice the whole block
there is already like this so nevermind ;)

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

>  #define   DP_AUX_CH_CTL_TIME_OUT_MASK	    (3 << 26)
>  #define   DP_AUX_CH_CTL_RECEIVE_ERROR	    (1 << 25)
>  #define   DP_AUX_CH_CTL_MESSAGE_SIZE_MASK    (0x1f << 20)
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 90e756c76f10..5b4c9484575b 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1044,7 +1044,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,
>  	       DP_AUX_CH_CTL_DONE |
>  	       (has_aux_irq ? DP_AUX_CH_CTL_INTERRUPT : 0) |
>  	       DP_AUX_CH_CTL_TIME_OUT_ERROR |
> -	       DP_AUX_CH_CTL_TIME_OUT_1600us |
> +	       DP_AUX_CH_CTL_TIME_OUT_MAX |
>  	       DP_AUX_CH_CTL_RECEIVE_ERROR |
>  	       (send_bytes << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |
>  	       DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
> -- 
> 2.14.1
>