Commit 2aa01e4d authored by Dnyaneshwar Bhadane's avatar Dnyaneshwar Bhadane Committed by Radhakrishna Sripada
Browse files

drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform defines 



Driver refers to the platform Alderlake S as ADLS_RPLS in places
and RAPTORLAKE_S in some.

v2:
- Unrolled wrapper IS_ADLS_GRAPHICS_STEP

v3:
- Replace IS_RAPTORLAKE_S instead of IS_ADLS_RPLS. (Tvrtko/Lucas).
- Remove unused macro IS_ADLS_GRAPHICS/DISPLAY_STEP
- Change the subject

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarDnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Reviewed-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-15-dnyaneshwar.bhadane@intel.com
parent 6373b793

drivers/gpu/drm/i915/display/intel_display_device.c

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915) 
	BUILD_BUG_ON(BITS_PER_TYPE(display_runtime->port_mask) < I915_MAX_PORTS);



	/* Wa_14011765242: adl-s A0,A1 */

	if (IS_ADLS_DISPLAY_STEP(i915, STEP_A0, STEP_A2))

	if (IS_ALDERLAKE_S(i915) && IS_DISPLAY_STEP(i915, STEP_A0, STEP_A2))

		for_each_pipe(i915, pipe)

			display_runtime->num_scalers[pipe] = 0;

	else if (DISPLAY_VER(i915) >= 11) {

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void uc_expand_default_options(struct intel_uc *uc) 
	}



	/* Intermediate platforms are HuC authentication only */

	if (IS_ALDERLAKE_S(i915) && !IS_ADLS_RPLS(i915)) {

	if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) {

		i915->params.enable_guc = ENABLE_GUC_LOAD_HUC;

		return;

	}

drivers/gpu/drm/i915/i915_drv.h

+1 −8
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
	IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G11)

#define IS_DG2_G12(i915) \

	IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G12)

#define IS_ADLS_RPLS(i915) \

#define IS_RAPTORLAKE_S(i915) \

	IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL)

#define IS_ALDERLAKE_P_N(i915) \

	IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)
@@ -653,13 +653,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 






#define IS_ADLS_DISPLAY_STEP(__i915, since, until) \

	(IS_ALDERLAKE_S(__i915) && \

	 IS_DISPLAY_STEP(__i915, since, until))



#define IS_ADLS_GRAPHICS_STEP(__i915, since, until) \

	(IS_ALDERLAKE_S(__i915) && \

	 IS_GRAPHICS_STEP(__i915, since, until))





#define IS_XEHPSDV_GRAPHICS_STEP(__i915, since, until) \

drivers/gpu/drm/i915/intel_step.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ void intel_step_init(struct drm_i915_private *i915) 
	} else if (IS_ALDERLAKE_P(i915)) {

		revids = adlp_revids;

		size = ARRAY_SIZE(adlp_revids);

	} else if (IS_ADLS_RPLS(i915)) {

	} else if (IS_RAPTORLAKE_S(i915)) {

		revids = adls_rpls_revids;

		size = ARRAY_SIZE(adls_rpls_revids);

	} else if (IS_ALDERLAKE_S(i915)) {