[Intel-gfx] [PATCH v2 08/10] drm/i915: move enum hpd_pin to intel_display.h

[Ville Syrjälä]

On Wed, Dec 01, 2021 at 03:57:10PM +0200, Jani Nikula wrote:
> It's not the ideal location, but a better alternative than
> i915_drv.h. The goal is to break the intel_display_types.h to i915_drv.h
> dependency.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display.h | 24 ++++++++++++++++++++
>  drivers/gpu/drm/i915/i915_drv.h              | 24 --------------------
>  2 files changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 38c15ec30ee7..8d8725b45d99 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -346,6 +346,30 @@ enum phy_fia {
>  	FIA3,
>  };
>  
> +enum hpd_pin {
> +	HPD_NONE = 0,
> +	HPD_TV = HPD_NONE,     /* TV is known to be unreliable */
> +	HPD_CRT,
> +	HPD_SDVO_B,
> +	HPD_SDVO_C,
> +	HPD_PORT_A,
> +	HPD_PORT_B,
> +	HPD_PORT_C,
> +	HPD_PORT_D,
> +	HPD_PORT_E,
> +	HPD_PORT_TC1,
> +	HPD_PORT_TC2,
> +	HPD_PORT_TC3,
> +	HPD_PORT_TC4,
> +	HPD_PORT_TC5,
> +	HPD_PORT_TC6,
> +
> +	HPD_NUM_PINS
> +};
> +
> +#define for_each_hpd_pin(__pin) \
> +	for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)
> +
>  #define for_each_pipe(__dev_priv, __p) \
>  	for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \
>  		for_each_if(INTEL_INFO(__dev_priv)->pipe_mask & BIT(__p))
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index e2ccc0696df7..27677bb18a6b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -117,30 +117,6 @@
>  
>  struct drm_i915_gem_object;
>  
> -enum hpd_pin {
> -	HPD_NONE = 0,
> -	HPD_TV = HPD_NONE,     /* TV is known to be unreliable */
> -	HPD_CRT,
> -	HPD_SDVO_B,
> -	HPD_SDVO_C,
> -	HPD_PORT_A,
> -	HPD_PORT_B,
> -	HPD_PORT_C,
> -	HPD_PORT_D,
> -	HPD_PORT_E,
> -	HPD_PORT_TC1,
> -	HPD_PORT_TC2,
> -	HPD_PORT_TC3,
> -	HPD_PORT_TC4,
> -	HPD_PORT_TC5,
> -	HPD_PORT_TC6,
> -
> -	HPD_NUM_PINS
> -};
> -
> -#define for_each_hpd_pin(__pin) \
> -	for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)
> -
>  /* Threshold == 5 for long IRQs, 50 for short */
>  #define HPD_STORM_DEFAULT_THRESHOLD 50
>  
> -- 
> 2.30.2

-- 
Ville Syrjälä
Intel