From: Anusha Srivatsa Date: Thu, 5 Oct 2023 20:54:47 +0000 (-0700) Subject: drm/xe/rplu: s/ADLP/ALDERLAKE_P X-Git-Tag: v6.8-rc1~111^2~7^2~306 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30e3b2cfb576f6ddf098f6de2a264b1ed75caa4c;p=thirdparty%2Fkernel%2Flinux.git drm/xe/rplu: s/ADLP/ALDERLAKE_P 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 Cc: Dnyaneshwar Bhadane Signed-off-by: Anusha Srivatsa Reviewed-by: Lucas De Marchi Link: https://lore.kernel.org/r/20231005205450.3177354-3-anusha.srivatsa@intel.com Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index fd8d7eddd6f6d..2652e7426258a 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -230,7 +230,7 @@ static const struct xe_device_desc adl_p_desc = { .has_llc = 1, .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 e378a64a0f863..b6fe4342f9f6a 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 371cac951e0f4..903c65405d3a1 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) {