Skip to content

Commit e549097

Browse files
bhadanednyaneshwarRadhakrishna Sripada
authored andcommitted
drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform defines
Follow consistent naming convention. Replace RKL with ROCKETLAKE.Replace IS_RKL_GRAPHICS_STEP with IS_ROCKETLAKE && IS_DISPLAY_STEP. v2: - s/RKL/rkl in the subject prefix(Anusha) v3: - Unrolled wrapper IS_RKL_DISPLAY_STEP. - Replace IS_PLATFORM && IS_DISPLAY_STEP (Jani/Tvrtko) 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 bd7b850 commit e549097

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)
16091609
return;
16101610

16111611
if (IS_ALDERLAKE_S(dev_priv) ||
1612-
IS_RKL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
1612+
(IS_ROCKETLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)))
16131613
/* Wa_1409767108 */
16141614
table = wa_1409767108_buddy_page_masks;
16151615
else

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,8 +659,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
659659
(IS_TIGERLAKE(__i915) && \
660660
IS_DISPLAY_STEP(__i915, since, until))
661661

662-
#define IS_RKL_DISPLAY_STEP(p, since, until) \
663-
(IS_ROCKETLAKE(p) && IS_DISPLAY_STEP(p, since, until))
664662

665663
#define IS_ADLS_DISPLAY_STEP(__i915, since, until) \
666664
(IS_ALDERLAKE_S(__i915) && \

0 commit comments

Comments
 (0)