[Intel-gfx] [PATCH 1/4] drm/i915: Cleanup SHOTPLUG_CTL status bits definitions

[Jani Nikula]

On Wed, 12 Dec 2012, Damien Lespiau <damien.lespiau at gmail.com> wrote:
> From: Damien Lespiau <damien.lespiau at intel.com>
>
> Those status bits don't follow the usual pattern: _MASK (those bits are
> write 1 to clear, useful to select the value we want to read) and the
> values shifted by the same amount.
>
> Cleaned that that up when poking at the register for testing purposes,
> might as well upstream that cleanup.

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

>
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h | 21 ++++++++++++---------
>  1 file changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index f2a5ea6..f834804 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -3558,27 +3558,30 @@
>  #define PORTD_PULSE_DURATION_6ms        (2 << 18)
>  #define PORTD_PULSE_DURATION_100ms      (3 << 18)
>  #define PORTD_PULSE_DURATION_MASK	(3 << 18)
> -#define PORTD_HOTPLUG_NO_DETECT         (0)
> -#define PORTD_HOTPLUG_SHORT_DETECT      (1 << 16)
> -#define PORTD_HOTPLUG_LONG_DETECT       (1 << 17)
> +#define PORTD_HOTPLUG_STATUS_MASK	(0x3 << 16)
> +#define  PORTD_HOTPLUG_NO_DETECT	(0 << 16)
> +#define  PORTD_HOTPLUG_SHORT_DETECT	(1 << 16)
> +#define  PORTD_HOTPLUG_LONG_DETECT	(2 << 16)
>  #define PORTC_HOTPLUG_ENABLE            (1 << 12)
>  #define PORTC_PULSE_DURATION_2ms        (0)
>  #define PORTC_PULSE_DURATION_4_5ms      (1 << 10)
>  #define PORTC_PULSE_DURATION_6ms        (2 << 10)
>  #define PORTC_PULSE_DURATION_100ms      (3 << 10)
>  #define PORTC_PULSE_DURATION_MASK	(3 << 10)
> -#define PORTC_HOTPLUG_NO_DETECT         (0)
> -#define PORTC_HOTPLUG_SHORT_DETECT      (1 << 8)
> -#define PORTC_HOTPLUG_LONG_DETECT       (1 << 9)
> +#define PORTC_HOTPLUG_STATUS_MASK	(0x3 << 8)
> +#define  PORTC_HOTPLUG_NO_DETECT	(0 << 8)
> +#define  PORTC_HOTPLUG_SHORT_DETECT	(1 << 8)
> +#define  PORTC_HOTPLUG_LONG_DETECT	(2 << 8)
>  #define PORTB_HOTPLUG_ENABLE            (1 << 4)
>  #define PORTB_PULSE_DURATION_2ms        (0)
>  #define PORTB_PULSE_DURATION_4_5ms      (1 << 2)
>  #define PORTB_PULSE_DURATION_6ms        (2 << 2)
>  #define PORTB_PULSE_DURATION_100ms      (3 << 2)
>  #define PORTB_PULSE_DURATION_MASK	(3 << 2)
> -#define PORTB_HOTPLUG_NO_DETECT         (0)
> -#define PORTB_HOTPLUG_SHORT_DETECT      (1 << 0)
> -#define PORTB_HOTPLUG_LONG_DETECT       (1 << 1)
> +#define PORTB_HOTPLUG_STATUS_MASK	(0x3 << 0)
> +#define  PORTB_HOTPLUG_NO_DETECT	(0 << 0)
> +#define  PORTB_HOTPLUG_SHORT_DETECT	(1 << 0)
> +#define  PORTB_HOTPLUG_LONG_DETECT	(2 << 0)
>  
>  #define PCH_GPIOA               0xc5010
>  #define PCH_GPIOB               0xc5014
> -- 
> 1.7.11.7
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx