> -----Original Message----- > From: Bhadane, Dnyaneshwar <dnyaneshwar.bhadane@xxxxxxxxx> > Sent: Wednesday, July 26, 2023 1:07 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Ursulin, Tvrtko <tvrtko.ursulin@xxxxxxxxx>; jani.nikula@xxxxxxxxxxxxxxx; > Srivatsa, Anusha <anusha.srivatsa@xxxxxxxxx>; Atwood, Matthew S > <matthew.s.atwood@xxxxxxxxx>; Roper, Matthew D > <matthew.d.roper@xxxxxxxxx>; Bhadane, Dnyaneshwar > <dnyaneshwar.bhadane@xxxxxxxxx>; Srivatsa, Anusha > <anusha.srivatsa@xxxxxxxxx> > Subject: [PATCH v3 07/14] 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 <tvrtko.ursulin@xxxxxxxxx> > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > Cc: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@xxxxxxxxx> Reviewed-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 2 -- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c > b/drivers/gpu/drm/i915/display/intel_display_power.c > index 38225e5d311e..9e01054c2430 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -1609,7 +1609,7 @@ static void tgl_bw_buddy_init(struct > drm_i915_private *dev_priv) > return; > > if (IS_ALDERLAKE_S(dev_priv) || > - IS_RKL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) > + (IS_ROCKETLAKE(dev_priv) && IS_DISPLAY_STEP(dev_priv, STEP_A0, > +STEP_B0))) > /* Wa_1409767108 */ > table = wa_1409767108_buddy_page_masks; > else > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index e6f77498d46c..f46846574420 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -660,8 +660,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > (IS_TIGERLAKE(__i915) && \ > IS_DISPLAY_STEP(__i915, since, until)) > > -#define IS_RKL_DISPLAY_STEP(p, since, until) \ > - (IS_ROCKETLAKE(p) && IS_DISPLAY_STEP(p, since, until)) > > #define IS_ADLS_DISPLAY_STEP(__i915, since, until) \ > (IS_ALDERLAKE_S(__i915) && \ > -- > 2.34.1
