Commit 6373b793 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Radhakrishna Sripada
Browse files

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



Follow consistent naming convention. Replace ADLP with
ALDERLAKE_P

Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarRadhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230801135344.3797924-14-dnyaneshwar.bhadane@intel.com
parent e5706c04

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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));

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/intel_step.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {