[PATCH 2/3] drm/xe: Drop undesired prefix from the platform name

[Rodrigo Vivi]

On Tue, May 21, 2024 at 04:22:56PM +0200, Michal Wajdeczko wrote:
> We don't have to use exact names of the enumerators as the
> potentially user-facing platform names. When constructing
> platform descriptor fields, use the unique platform tag and
> add the XE_ prefix only to the generated enum field.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>

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

> ---
>  drivers/gpu/drm/xe/xe_pci.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index b30fe4849038..34ff997439f0 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -75,7 +75,7 @@ __diag_push();
>  __diag_ignore_all("-Woverride-init", "Allow field overrides in table");
>  
>  #define PLATFORM(x)		\
> -	.platform = (x),	\
> +	.platform = XE_##x,	\
>  	.platform_name = #x
>  
>  #define NOP(x)	x
> @@ -222,7 +222,7 @@ static const struct xe_media_desc media_xe2 = {
>  static const struct xe_device_desc tgl_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
> -	PLATFORM(XE_TIGERLAKE),
> +	PLATFORM(TIGERLAKE),
>  	.has_display = true,
>  	.has_llc = true,
>  	.require_force_probe = true,
> @@ -231,7 +231,7 @@ static const struct xe_device_desc tgl_desc = {
>  static const struct xe_device_desc rkl_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
> -	PLATFORM(XE_ROCKETLAKE),
> +	PLATFORM(ROCKETLAKE),
>  	.has_display = true,
>  	.has_llc = true,
>  	.require_force_probe = true,
> @@ -242,7 +242,7 @@ static const u16 adls_rpls_ids[] = { XE_RPLS_IDS(NOP), 0 };
>  static const struct xe_device_desc adl_s_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
> -	PLATFORM(XE_ALDERLAKE_S),
> +	PLATFORM(ALDERLAKE_S),
>  	.has_display = true,
>  	.has_llc = true,
>  	.require_force_probe = true,
> @@ -257,7 +257,7 @@ static const u16 adlp_rplu_ids[] = { XE_RPLU_IDS(NOP), 0 };
>  static const struct xe_device_desc adl_p_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
> -	PLATFORM(XE_ALDERLAKE_P),
> +	PLATFORM(ALDERLAKE_P),
>  	.has_display = true,
>  	.has_llc = true,
>  	.require_force_probe = true,
> @@ -270,7 +270,7 @@ static const struct xe_device_desc adl_p_desc = {
>  static const struct xe_device_desc adl_n_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
> -	PLATFORM(XE_ALDERLAKE_N),
> +	PLATFORM(ALDERLAKE_N),
>  	.has_display = true,
>  	.has_llc = true,
>  	.require_force_probe = true,
> @@ -283,7 +283,7 @@ static const struct xe_device_desc dg1_desc = {
>  	.graphics = &graphics_xelpp,
>  	.media = &media_xem,
>  	DGFX_FEATURES,
> -	PLATFORM(XE_DG1),
> +	PLATFORM(DG1),
>  	.has_display = true,
>  	.has_heci_gscfi = 1,
>  	.require_force_probe = true,
> @@ -295,7 +295,7 @@ static const u16 dg2_g12_ids[] = { XE_DG2_G12_IDS(NOP), 0 };
>  
>  #define DG2_FEATURES \
>  	DGFX_FEATURES, \
> -	PLATFORM(XE_DG2), \
> +	PLATFORM(DG2), \
>  	.has_heci_gscfi = 1, \
>  	.subplatforms = (const struct xe_subplatform_desc[]) { \
>  		{ XE_SUBPLATFORM_DG2_G10, "G10", dg2_g10_ids }, \
> @@ -325,7 +325,7 @@ static const struct xe_device_desc dg2_desc = {
>  static const struct xe_device_desc pvc_desc = {
>  	.graphics = &graphics_xehpc,
>  	DGFX_FEATURES,
> -	PLATFORM(XE_PVC),
> +	PLATFORM(PVC),
>  	.has_display = false,
>  	.has_heci_gscfi = 1,
>  	.require_force_probe = true,
> @@ -334,19 +334,19 @@ static const struct xe_device_desc pvc_desc = {
>  static const struct xe_device_desc mtl_desc = {
>  	/* .graphics and .media determined via GMD_ID */
>  	.require_force_probe = true,
> -	PLATFORM(XE_METEORLAKE),
> +	PLATFORM(METEORLAKE),
>  	.has_display = true,
>  };
>  
>  static const struct xe_device_desc lnl_desc = {
> -	PLATFORM(XE_LUNARLAKE),
> +	PLATFORM(LUNARLAKE),
>  	.has_display = true,
>  	.require_force_probe = true,
>  };
>  
>  static const struct xe_device_desc bmg_desc __maybe_unused = {
>  	DGFX_FEATURES,
> -	PLATFORM(XE_BATTLEMAGE),
> +	PLATFORM(BATTLEMAGE),
>  	.has_display = true,
>  	.require_force_probe = true,
>  };
> -- 
> 2.43.0
>