Re: [PATCH 3/6] drm/i915/display: join the platform and subplatform macros

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Tue, Jun 18, 2024 at 05:22:53PM +0300, Jani Nikula wrote:
> We'll want to use the subplatforms similar to platforms.

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

> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  .../drm/i915/display/intel_display_device.c   |  2 +-
>  .../drm/i915/display/intel_display_device.h   | 51 +++++++++----------
>  2 files changed, 25 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
> index d900c30907ac..80563af7ac71 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -21,7 +21,7 @@ __diag_push();
>  __diag_ignore_all("-Woverride-init", "Allow field initialization overrides for display info");
>  
>  struct subplatform_desc {
> -	enum intel_display_subplatform subplatform;
> +	enum intel_display_platform subplatform;
>  	const char *name;
>  	const u16 *pciidlist;
>  };
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
> index aca3dfd5e7af..50485235ef09 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
> @@ -69,7 +69,29 @@ struct drm_printer;
>  	/* Display ver 20 (based on GMD ID) */ \
>  	func(LUNARLAKE) \
>  	/* Display ver 14.1 (based on GMD ID) */ \
> -	func(BATTLEMAGE)
> +	func(BATTLEMAGE) \
> +	/* Subplatforms */ \
> +	func(HASWELL_ULT) \
> +	func(HASWELL_ULX) \
> +	func(BROADWELL_ULT) \
> +	func(BROADWELL_ULX) \
> +	func(SKYLAKE_ULT) \
> +	func(SKYLAKE_ULX) \
> +	func(KABYLAKE_ULT) \
> +	func(KABYLAKE_ULX) \
> +	func(COFFEELAKE_ULT) \
> +	func(COFFEELAKE_ULX) \
> +	func(COMETLAKE_ULT) \
> +	func(COMETLAKE_ULX) \
> +	func(ICELAKE_PORT_F) \
> +	func(TIGERLAKE_UY) \
> +	func(ALDERLAKE_S_RAPTORLAKE_S) \
> +	func(ALDERLAKE_P_ALDERLAKE_N) \
> +	func(ALDERLAKE_P_RAPTORLAKE_P) \
> +	func(ALDERLAKE_P_RAPTORLAKE_U) \
> +	func(DG2_G10) \
> +	func(DG2_G11) \
> +	func(DG2_G12)
>  
>  #define ENUM(x) INTEL_DISPLAY_ ## x,
>  
> @@ -79,31 +101,6 @@ enum intel_display_platform {
>  
>  #undef ENUM
>  
> -enum intel_display_subplatform {
> -	INTEL_DISPLAY_SUBPLATFORM_UNINITIALIZED = 0,
> -	INTEL_DISPLAY_HASWELL_ULT,
> -	INTEL_DISPLAY_HASWELL_ULX,
> -	INTEL_DISPLAY_BROADWELL_ULT,
> -	INTEL_DISPLAY_BROADWELL_ULX,
> -	INTEL_DISPLAY_SKYLAKE_ULT,
> -	INTEL_DISPLAY_SKYLAKE_ULX,
> -	INTEL_DISPLAY_KABYLAKE_ULT,
> -	INTEL_DISPLAY_KABYLAKE_ULX,
> -	INTEL_DISPLAY_COFFEELAKE_ULT,
> -	INTEL_DISPLAY_COFFEELAKE_ULX,
> -	INTEL_DISPLAY_COMETLAKE_ULT,
> -	INTEL_DISPLAY_COMETLAKE_ULX,
> -	INTEL_DISPLAY_ICELAKE_PORT_F,
> -	INTEL_DISPLAY_TIGERLAKE_UY,
> -	INTEL_DISPLAY_ALDERLAKE_S_RAPTORLAKE_S,
> -	INTEL_DISPLAY_ALDERLAKE_P_ALDERLAKE_N,
> -	INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_P,
> -	INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_U,
> -	INTEL_DISPLAY_DG2_G10,
> -	INTEL_DISPLAY_DG2_G11,
> -	INTEL_DISPLAY_DG2_G12,
> -};
> -
>  #define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \
>  	/* Keep in alphabetical order */ \
>  	func(cursor_needs_physical); \
> @@ -203,7 +200,7 @@ enum intel_display_subplatform {
>  
>  struct intel_display_runtime_info {
>  	enum intel_display_platform platform;
> -	enum intel_display_subplatform subplatform;
> +	enum intel_display_platform subplatform;
>  
>  	struct intel_display_ip_ver {
>  		u16 ver;
> -- 
> 2.39.2
>