Skip to content

Commit 6373b79

Browse files
anushasrRadhakrishna Sripada
authored andcommitted
drm/i915/adln: s/ADLP/ALDERLAKE_P in ADLN defines
Follow consistent naming convention. Replace ADLP with ALDERLAKE_P Signed-off-by: Anusha Srivatsa <[email protected]> Acked-by: Jani Nikula <[email protected]> Signed-off-by: Radhakrishna Sripada <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent e5706c0 commit 6373b79

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static int guc_hwconfig_fill_buffer(struct intel_guc *guc, struct intel_hwconfig
9494

9595
static bool has_table(struct drm_i915_private *i915)
9696
{
97-
if (IS_ALDERLAKE_P(i915) && !IS_ADLP_N(i915))
97+
if (IS_ALDERLAKE_P(i915) && !IS_ALDERLAKE_P_N(i915))
9898
return true;
9999
if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55))
100100
return true;

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
279279
* ADL-S, otherwise the GuC might attempt to fetch a config table that
280280
* does not exist.
281281
*/
282-
if (IS_ADLP_N(i915))
282+
if (IS_ALDERLAKE_P_N(i915))
283283
p = INTEL_ALDERLAKE_S;
284284

285285
GEM_BUG_ON(uc_fw->type >= ARRAY_SIZE(blobs_all));

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
585585
IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G12)
586586
#define IS_ADLS_RPLS(i915) \
587587
IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL)
588-
#define IS_ADLP_N(i915) \
588+
#define IS_ALDERLAKE_P_N(i915) \
589589
IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)
590590
#define IS_RAPTORLAKE_P(i915) \
591591
IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)

drivers/gpu/drm/i915/intel_step.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void intel_step_init(struct drm_i915_private *i915)
192192
} else if (IS_XEHPSDV(i915)) {
193193
revids = xehpsdv_revids;
194194
size = ARRAY_SIZE(xehpsdv_revids);
195-
} else if (IS_ADLP_N(i915)) {
195+
} else if (IS_ALDERLAKE_P_N(i915)) {
196196
revids = adlp_n_revids;
197197
size = ARRAY_SIZE(adlp_n_revids);
198198
} else if (IS_RAPTORLAKE_P(i915)) {

0 commit comments

Comments
 (0)