[Intel-xe] [PATCH 1/5] drm/xe/rplu: s/ADLP/ALDERLAKE_P

[Lucas De Marchi]

On Tue, Oct 03, 2023 at 01:37:12PM -0700, Anusha Srivatsa wrote:
>i915 now uses full names for platforms. So we now have
>ALDERLAKE instead of ADL. Extend this to xe driver as well.
>This will make it easier for macro magic usages.
>
>v2: Do not make changes to compat-i915-headers/i915_drv.h
>file with the rest of the changes (Jani)
>
>Cc: Jani Nikula <jani.nikula at intel.com>
>Cc: Dnyaneshwar Bhadane <dnyaneshwar.bhadane at intel.com>
>Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>

I don't like the very super long name, but if it was decided to keep it
like that on i915, it's better to keep it consistent.

And hopefully this will stop soon as we move away from
platform/subplatform.

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_pci.c            | 2 +-
> drivers/gpu/drm/xe/xe_platform_types.h | 2 +-
> drivers/gpu/drm/xe/xe_step.c           | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
>index 32d9ef1e6dc2..ba67f6fcfb4f 100644
>--- a/drivers/gpu/drm/xe/xe_pci.c
>+++ b/drivers/gpu/drm/xe/xe_pci.c
>@@ -240,7 +240,7 @@ static const struct xe_device_desc adl_p_desc = {
> 	.has_llc = true,
> 	.require_force_probe = true,
> 	.subplatforms = (const struct xe_subplatform_desc[]) {
>-		{ XE_SUBPLATFORM_ADLP_RPLU, "RPLU", adlp_rplu_ids },
>+		{ XE_SUBPLATFORM_ALDERLAKE_P_RPLU, "RPLU", adlp_rplu_ids },
> 		{},
> 	},
> };
>diff --git a/drivers/gpu/drm/xe/xe_platform_types.h b/drivers/gpu/drm/xe/xe_platform_types.h
>index e378a64a0f86..b6fe4342f9f6 100644
>--- a/drivers/gpu/drm/xe/xe_platform_types.h
>+++ b/drivers/gpu/drm/xe/xe_platform_types.h
>@@ -27,7 +27,7 @@ enum xe_platform {
> enum xe_subplatform {
> 	XE_SUBPLATFORM_UNINITIALIZED = 0,
> 	XE_SUBPLATFORM_NONE,
>-	XE_SUBPLATFORM_ADLP_RPLU,
>+	XE_SUBPLATFORM_ALDERLAKE_P_RPLU,
> 	XE_SUBPLATFORM_DG2_G10,
> 	XE_SUBPLATFORM_DG2_G11,
> 	XE_SUBPLATFORM_DG2_G12,
>diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c
>index 371cac951e0f..903c65405d3a 100644
>--- a/drivers/gpu/drm/xe/xe_step.c
>+++ b/drivers/gpu/drm/xe/xe_step.c
>@@ -143,7 +143,7 @@ struct xe_step_info xe_step_pre_gmdid_get(struct xe_device *xe)
> 	} else if (xe->info.platform == XE_ALDERLAKE_N) {
> 		revids = adln_revids;
> 		size = ARRAY_SIZE(adln_revids);
>-	} else if (xe->info.subplatform == XE_SUBPLATFORM_ADLP_RPLU) {
>+	} else if (xe->info.subplatform == XE_SUBPLATFORM_ALDERLAKE_P_RPLU) {
> 		revids = adlp_rpl_revids;
> 		size = ARRAY_SIZE(adlp_rpl_revids);
> 	} else if (xe->info.platform == XE_ALDERLAKE_P) {
>-- 
>2.25.1
>