Commit 48077b0b authored by Dnyaneshwar Bhadane's avatar Dnyaneshwar Bhadane Committed by Radhakrishna Sripada
Browse files

drm/i915/tgl: s/TGL/TIGERLAKE for platform/subplatform defines 



Follow consistent naming convention. Replace TGL with
TIGERLAKE.Replace IS_TGL_DISPLAY_STEP with
IS_TIGERLAKE() && IS_DISPLAY_STEP().

v2:
- s/TGL/tgl in the subject prefix(Anusha)

v3:
- Unrolled wrapper IS_TGL_DISPLAY_STEP and Replace
- Replace IS_PLATFORM && DISPLAY_STEP (Jani/Tvrtko).

v4:
- Removed unused macros

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-10-dnyaneshwar.bhadane@intel.com
parent 0c65dc06

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

+1 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, 
	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	if (crtc_state->port_clock > 270000) {

		if (IS_TGL_UY(dev_priv)) {

		if (IS_TIGERLAKE_UY(dev_priv)) {

			return intel_get_buf_trans(&tgl_uy_combo_phy_trans_dp_hbr2,

						   n_entries);

		} else {

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

+1 −1
Original line number Diff line number Diff line
@@ -2196,7 +2196,7 @@ static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915, 


	/* Wa_14010477008 */

	if (IS_DG1(i915) || IS_ROCKETLAKE(i915) ||

	    IS_TGL_DISPLAY_STEP(i915, STEP_A0, STEP_D0))

		(IS_TIGERLAKE(i915) && IS_DISPLAY_STEP(i915, STEP_A0, STEP_D0)))

		return false;



	/* Wa_22011186057 */

drivers/gpu/drm/i915/i915_drv.h

+1 −4
Original line number Diff line number Diff line
@@ -645,15 +645,12 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_ICL_WITH_PORT_F(i915) \

	IS_SUBPLATFORM(i915, INTEL_ICELAKE, INTEL_SUBPLATFORM_PORTF)



#define IS_TGL_UY(i915) \

#define IS_TIGERLAKE_UY(i915) \

	IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY)









#define IS_TGL_DISPLAY_STEP(__i915, since, until) \

	(IS_TIGERLAKE(__i915) && \

	 IS_DISPLAY_STEP(__i915, since, until))





#define IS_ADLS_DISPLAY_STEP(__i915, since, until) \

drivers/gpu/drm/i915/intel_step.c

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

		revids = rkl_revids;

		size = ARRAY_SIZE(rkl_revids);

	} else if (IS_TGL_UY(i915)) {

	} else if (IS_TIGERLAKE_UY(i915)) {

		revids = tgl_uy_revids;

		size = ARRAY_SIZE(tgl_uy_revids);

	} else if (IS_TIGERLAKE(i915)) {