Skip to content

Commit 48077b0

Browse files
bhadanednyaneshwarRadhakrishna Sripada
authored andcommitted
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 <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Anusha Srivatsa <[email protected]> Signed-off-by: Dnyaneshwar Bhadane <[email protected]> Reviewed-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 0c65dc0 commit 48077b0

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder,
14101410
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
14111411

14121412
if (crtc_state->port_clock > 270000) {
1413-
if (IS_TGL_UY(dev_priv)) {
1413+
if (IS_TIGERLAKE_UY(dev_priv)) {
14141414
return intel_get_buf_trans(&tgl_uy_combo_phy_trans_dp_hbr2,
14151415
n_entries);
14161416
} else {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2196,7 +2196,7 @@ static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915,
21962196

21972197
/* Wa_14010477008 */
21982198
if (IS_DG1(i915) || IS_ROCKETLAKE(i915) ||
2199-
IS_TGL_DISPLAY_STEP(i915, STEP_A0, STEP_D0))
2199+
(IS_TIGERLAKE(i915) && IS_DISPLAY_STEP(i915, STEP_A0, STEP_D0)))
22002200
return false;
22012201

22022202
/* Wa_22011186057 */

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -645,15 +645,12 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
645645
#define IS_ICL_WITH_PORT_F(i915) \
646646
IS_SUBPLATFORM(i915, INTEL_ICELAKE, INTEL_SUBPLATFORM_PORTF)
647647

648-
#define IS_TGL_UY(i915) \
648+
#define IS_TIGERLAKE_UY(i915) \
649649
IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY)
650650

651651

652652

653653

654-
#define IS_TGL_DISPLAY_STEP(__i915, since, until) \
655-
(IS_TIGERLAKE(__i915) && \
656-
IS_DISPLAY_STEP(__i915, since, until))
657654

658655

659656
#define IS_ADLS_DISPLAY_STEP(__i915, since, until) \

drivers/gpu/drm/i915/intel_step.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ void intel_step_init(struct drm_i915_private *i915)
213213
} else if (IS_ROCKETLAKE(i915)) {
214214
revids = rkl_revids;
215215
size = ARRAY_SIZE(rkl_revids);
216-
} else if (IS_TGL_UY(i915)) {
216+
} else if (IS_TIGERLAKE_UY(i915)) {
217217
revids = tgl_uy_revids;
218218
size = ARRAY_SIZE(tgl_uy_revids);
219219
} else if (IS_TIGERLAKE(i915)) {

0 commit comments

Comments
 (0)