drm/i915/adln: s/ADLP/ALDERLAKE_P in ADLN defines

Follow consistent naming convention. Replace ADLP with
ALDERLAKE_P

Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230801135344.3797924-14-dnyaneshwar.bhadane@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
index 852bea0208ce445ebf0f570cb36f8c5be757d033..cc9569af7f0cd71c809b4bbb1546d6e0bcabd797 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
@@ -94,7 +94,7 @@ static int guc_hwconfig_fill_buffer(struct intel_guc *guc, struct intel_hwconfig
 
 static bool has_table(struct drm_i915_private *i915)
 {
-       if (IS_ALDERLAKE_P(i915) && !IS_ADLP_N(i915))
+       if (IS_ALDERLAKE_P(i915) && !IS_ALDERLAKE_P_N(i915))
                return true;
        if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55))
                return true;

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 3621963df6b5aae9dce82fd896b7a868fcc57861..596e7ee1973da49e4e4d6771efc77b6ecb45384a 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -279,7 +279,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
         * ADL-S, otherwise the GuC might attempt to fetch a config table that
         * does not exist.
         */
-       if (IS_ADLP_N(i915))
+       if (IS_ALDERLAKE_P_N(i915))
                p = INTEL_ALDERLAKE_S;
 
        GEM_BUG_ON(uc_fw->type >= ARRAY_SIZE(blobs_all));

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8217bbfef780832663521af20f206ee349c90791..29640c2c3b4a6eff789277ee8cbe909f725c8921 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -585,7 +585,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
        IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G12)
 #define IS_ADLS_RPLS(i915) \
        IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL)
-#define IS_ADLP_N(i915) \
+#define IS_ALDERLAKE_P_N(i915) \
        IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)
 #define IS_RAPTORLAKE_P(i915) \
        IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)

diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
index 7601122765b79706a3e5fa4de934f5a6d300d5ea..5553de469fa03fbf3d5ea71f9fb300f2a990d724 100644 (file)
--- a/drivers/gpu/drm/i915/intel_step.c
+++ b/drivers/gpu/drm/i915/intel_step.c
@@ -192,7 +192,7 @@ void intel_step_init(struct drm_i915_private *i915)
        } else if (IS_XEHPSDV(i915)) {
                revids = xehpsdv_revids;
                size = ARRAY_SIZE(xehpsdv_revids);
-       } else if (IS_ADLP_N(i915)) {
+       } else if (IS_ALDERLAKE_P_N(i915)) {
                revids = adlp_n_revids;
                size = ARRAY_SIZE(adlp_n_revids);
        } else if (IS_RAPTORLAKE_P(i915)) {