[Intel-gfx] [PATCH 1/6] drm/i915: make the intel_display_power_domain enum compact

[Jesse Barnes]

On Wed, 16 Oct 2013 17:25:48 +0300
Imre Deak <imre.deak at intel.com> wrote:

> Upcoming patches will add tracking for a set of power domains via a
> bitmask; to make things simple there remove the current gap in the
> enum values.
> 
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 2ea66f2..9b04d05 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -98,14 +98,16 @@ enum intel_display_power_domain {
>  	POWER_DOMAIN_TRANSCODER_A,
>  	POWER_DOMAIN_TRANSCODER_B,
>  	POWER_DOMAIN_TRANSCODER_C,
> -	POWER_DOMAIN_TRANSCODER_EDP = POWER_DOMAIN_TRANSCODER_A + 0xF,
> +	POWER_DOMAIN_TRANSCODER_EDP,
>  	POWER_DOMAIN_VGA,
>  };
>  
>  #define POWER_DOMAIN_PIPE(pipe) ((pipe) + POWER_DOMAIN_PIPE_A)
>  #define POWER_DOMAIN_PIPE_PANEL_FITTER(pipe) \
>  		((pipe) + POWER_DOMAIN_PIPE_A_PANEL_FITTER)
> -#define POWER_DOMAIN_TRANSCODER(tran) ((tran) + POWER_DOMAIN_TRANSCODER_A)
> +#define POWER_DOMAIN_TRANSCODER(tran) \
> +	((tran) == TRANSCODER_EDP ? POWER_DOMAIN_TRANSCODER_EDP : \
> +	 (tran) + POWER_DOMAIN_TRANSCODER_A)
>  
>  enum hpd_pin {
>  	HPD_NONE = 0,

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center