> -----Original Message-----
> From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx>
> Sent: Friday, June 16, 2023 5:37 PM
> To: Bhadane, Dnyaneshwar <dnyaneshwar.bhadane@xxxxxxxxx>; intel-
> gfx@xxxxxxxxxxxxxxxxxxxxx
> Subject: Re: [PATCH 11/11] drm/i915/mtl: s/MTL/METEORLAKE for
> platform/subplatform defines
>
>
> On 16/06/2023 13:05, Tvrtko Ursulin wrote:
> >
> > On 16/06/2023 12:42, Dnyaneshwar Bhadane wrote:
> >> Follow consistent naming convention. Replace MTL with METEORLAKE
> >>
> >> Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@xxxxxxxxx>
> >> ---
> >> drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
> >> drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +-
> >> drivers/gpu/drm/i915/display/intel_psr.c | 10 ++---
> >> .../drm/i915/display/skl_universal_plane.c | 4 +-
> >> drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 8 ++--
> >> drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +-
> >> .../drm/i915/gt/intel_execlists_submission.c | 2 +-
> >> drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 4 +-
> >> drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +-
> >> drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +-
> >> drivers/gpu/drm/i915/gt/intel_workarounds.c | 44
> >> +++++++++----------
> >> drivers/gpu/drm/i915/gt/uc/intel_guc.c | 4 +-
> >> .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +-
> >> drivers/gpu/drm/i915/i915_drv.h | 6 +--
> >> drivers/gpu/drm/i915/i915_perf.c | 4 +-
> >> 15 files changed, 51 insertions(+), 51 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c
> >> b/drivers/gpu/drm/i915/display/intel_fbc.c
> >> index 7f8b2d7713c7..6358a8b26172 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> >> @@ -1093,7 +1093,7 @@ static int intel_fbc_check_plane(struct
> >> intel_atomic_state *state,
> >> /* Wa_14016291713 */
> >> if ((IS_DISPLAY_VER(i915, 12, 13) ||
> >> - IS_MTL_DISPLAY_STEP(i915, STEP_A0, STEP_C0)) &&
> >> + IS_METEORLAKE_DISPLAY_STEP(i915, STEP_A0, STEP_C0)) &&
> >> crtc_state->has_psr) {
> >> plane_state->no_fbc_reason = "PSR1 enabled
> >> (Wa_14016291713)";
> >> return 0;
> >> diff --git a/drivers/gpu/drm/i915/display/intel_pmdemand.c
> >> b/drivers/gpu/drm/i915/display/intel_pmdemand.c
> >> index f7608d363634..8c3158b188ef 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_pmdemand.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_pmdemand.c
> >> @@ -92,7 +92,7 @@ int intel_pmdemand_init(struct drm_i915_private
> >> *i915)
> >> &pmdemand_state->base,
> >> &intel_pmdemand_funcs);
> >> - if (IS_MTL_DISPLAY_STEP(i915, STEP_A0, STEP_C0))
> >> + if (IS_METEORLAKE_DISPLAY_STEP(i915, STEP_A0, STEP_C0))
> >> /* Wa_14016740474 */
> >> intel_de_rmw(i915, XELPD_CHICKEN_DCPR_3, 0,
> >> DMD_RSP_TIMEOUT_DISABLE); diff --git
> >> a/drivers/gpu/drm/i915/display/intel_psr.c
> >> b/drivers/gpu/drm/i915/display/intel_psr.c
> >> index cf82cc295319..00c98c2b4324 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> >> @@ -1247,7 +1247,7 @@ static void wm_optimization_wa(struct intel_dp
> >> *intel_dp,
> >> bool set_wa_bit = false;
> >> /* Wa_14015648006 */
> >> - if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
> >> IS_DISPLAY_VER(dev_priv, 11, 13))
> >> set_wa_bit |= crtc_state->wm_level_disabled; @@ -1320,7
> >> +1320,7 @@ static void intel_psr_enable_source(struct intel_dp
> >> *intel_dp,
> >> * All supported adlp panels have 1-based X granularity,
> >> this may
> >> * cause issues if non-supported panels are used.
> >> */
> >> - if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
> >> intel_de_rmw(dev_priv,
> >> MTL_CHICKEN_TRANS(cpu_transcoder), 0,
> >> ADLP_1_BASED_X_GRANULARITY);
> >> else if (IS_ALDERLAKE_P(dev_priv)) @@ -1328,7 +1328,7 @@
> >> static void intel_psr_enable_source(struct intel_dp *intel_dp,
> >> ADLP_1_BASED_X_GRANULARITY);
> >> /* Wa_16012604467:adlp,mtl[a0,b0] */
> >> - if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
> >> intel_de_rmw(dev_priv,
> >> MTL_CLKGATE_DIS_TRANS(cpu_transcoder), 0,
> >> MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS);
> >> @@ -1489,7 +1489,7 @@ static void intel_psr_disable_locked(struct
> >> intel_dp *intel_dp)
> >> if (intel_dp->psr.psr2_enabled) {
> >> /* Wa_16012604467:adlp,mtl[a0,b0] */
> >> - if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
> >> intel_de_rmw(dev_priv,
> >> MTL_CLKGATE_DIS_TRANS(cpu_transcoder),
> >> MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS, 0); @@
> >> -1963,7 +1963,7 @@ int intel_psr2_sel_fetch_update(struct
> >> intel_atomic_state *state,
> >> goto skip_sel_fetch_set_loop;
> >> /* Wa_14014971492 */
> >> - if ((IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
> >> + if ((IS_METEORLAKE_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
> >> IS_ALDERLAKE_P(dev_priv) || IS_TIGERLAKE(dev_priv)) &&
> >> crtc_state->splitter.enable)
> >> pipe_clip.y1 = 0;
> >> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> >> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> >> index 636a88827a8f..2458a9ea25ba 100644
> >> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> >> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> >> @@ -2169,8 +2169,8 @@ static bool skl_plane_has_rc_ccs(struct
> >> drm_i915_private *i915,
> >> enum pipe pipe, enum plane_id plane_id)
> >> {
> >> /* Wa_14017240301 */
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >
> > Reading this casually, the amount of the checks exactly like the above
> > smells like we could easily add a "is mtl graphics step" helper which
> > does not care about the subplatform variant and make the source and
> > binary more compact. Might as well while churning the codebase.
> >
> > Something like:
> >
> > #define IS_ANY_MTL_GRAPHICS_STEP(__i915, since, until) \
> > (IS_METEORLAKE(__i915) && \
> > IS_GRAPHICS_STEP(__i915, since, until))
> >
> > ?
> >
> > MTL_ANY, ANY_MTL, or a 3rd option I don't know.
>
> Sorry forgot to say.. or make existing IS_MTL_GRAPHICS_STEP not care about
> the platform and introduce like IS_MTL_P/M_GRAPHICS_STEP. That would align
> more with IS_ADLS_GRAPHICS_STEP and IS_ADLP_DISPLAY_STEP even.
Hi Tvrtko /Jani,
I am adding IS_METEORLAKE_P_GRAPHICS_STEP and IS_METEORLAKE_M_GRAPHICS_STEP
For that will replace all the occurrence IS_MTL_GRAPHICS_STEP. This way we don’t
need to supply 'P' or 'M' explicitly.
#define IS_METEORLAKE_P_GRAPHICS_STEP(__i915, since, until) \
(IS_METEORLAKE_P(__i915) && \
IS_GRAPHICS_STEP(__i915, since, until))
#define IS_METEORLAKE_M_GRAPHICS_STEP(__i915, since, until) \
(IS_METEORLAKE_M(__i915) && \
IS_GRAPHICS_STEP(__i915, since, until))
Apart from MTL for SKL/KBL/ RKL /TGL platform we can user IS_FULL_PLATFORM_PLATFORM()
&& IS_GRAPHICS_STEP removing the wrapper for them IS_PLATOFORM_GRAPHICS_STEP.
For the MTL there are multiple occurrences of check like
i.e.
if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
Replacing It with IS_FULL_PLATFORM_NAME () && IS_GRAPHICS_STEP format(Jani's suggestion)
will become untidy for MTL.
Regards,
Dnyaneshwar
>
> >
> > Regards,
> >
> > Tvrtko
> >
> >> return false;
> >> /* Wa_22011186057 */
> >> diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> >> b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> >> index 3173e811463d..ec0771dc662a 100644
> >> --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> >> +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> >> @@ -180,8 +180,8 @@ u32 *gen12_emit_aux_table_inv(struct intel_gt
> >> *gt,
> >> u32 *cs, const i915_reg_t inv
> >> static int mtl_dummy_pipe_control(struct i915_request *rq)
> >> {
> >> /* Wa_14016712196 */
> >> - if (IS_MTL_GRAPHICS_STEP(rq->engine->i915, M, STEP_A0, STEP_B0)
> >> ||
> >> - IS_MTL_GRAPHICS_STEP(rq->engine->i915, P, STEP_A0, STEP_B0))
> >> {
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(rq->engine->i915, M, STEP_A0,
> >> STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(rq->engine->i915, P, STEP_A0,
> >> STEP_B0)) {
> >> u32 *cs;
> >> /* dummy PIPE_CONTROL + depth flush */ @@ -765,8 +765,8 @@
> >> u32 *gen12_emit_fini_breadcrumb_rcs(struct
> >> i915_request *rq, u32 *cs)
> >> PIPE_CONTROL_FLUSH_ENABLE);
> >> /* Wa_14016712196 */
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> /* dummy PIPE_CONTROL + depth flush */
> >> cs = gen12_emit_pipe_control(cs, 0,
> >> PIPE_CONTROL_DEPTH_CACHE_FLUSH, 0); diff
> >> --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> >> b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> >> index 0aff5bb13c53..f9af6b1a7c01 100644
> >> --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> >> +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> >> @@ -1616,7 +1616,7 @@ static int __intel_engine_stop_cs(struct
> >> intel_engine_cs *engine,
> >> * Wa_22011802037: Prior to doing a reset, ensure CS is
> >> * stopped, set ring stop bit and prefetch disable bit to halt
> >> CS
> >> */
> >> - if (IS_MTL_GRAPHICS_STEP(engine->i915, M, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(engine->i915, M, STEP_A0,
> >> STEP_B0) ||
> >> (GRAPHICS_VER(engine->i915) >= 11 &&
> >> GRAPHICS_VER_FULL(engine->i915) < IP_VER(12, 70)))
> >> intel_uncore_write_fw(uncore,
> >> RING_MODE_GEN7(engine->mmio_base),
> >> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> >> b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> >> index 2ebd937f3b4c..901ecd59afbc 100644
> >> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> >> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> >> @@ -3001,7 +3001,7 @@ static void execlists_reset_prepare(struct
> >> intel_engine_cs *engine)
> >> * Wa_22011802037: In addition to stopping the cs, we need
> >> * to wait for any pending mi force wakeups
> >> */
> >> - if (IS_MTL_GRAPHICS_STEP(engine->i915, M, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(engine->i915, M, STEP_A0,
> >> STEP_B0) ||
> >> (GRAPHICS_VER(engine->i915) >= 11 &&
> >> GRAPHICS_VER_FULL(engine->i915) < IP_VER(12, 70)))
> >> intel_engine_wait_for_pending_mi_fw(engine);
> >> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> >> b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> >> index 0b414eae1683..1dc7180eeb27 100644
> >> --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> >> +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> >> @@ -166,8 +166,8 @@ void intel_gt_mcr_init(struct intel_gt *gt)
> >> gt->steering_table[OADDRM] = xelpmp_oaddrm_steering_table;
> >> } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) {
> >> /* Wa_14016747170 */
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0)
> >> +||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> fuse = REG_FIELD_GET(MTL_GT_L3_EXC_MASK,
> >> intel_uncore_read(gt->uncore,
> >> MTL_GT_ACTIVITY_FACTOR)); diff
> >> --git a/drivers/gpu/drm/i915/gt/intel_lrc.c
> >> b/drivers/gpu/drm/i915/gt/intel_lrc.c
> >> index a4ec20aaafe2..cd9a76f048f3 100644
> >> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> >> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> >> @@ -1370,8 +1370,8 @@ gen12_emit_indirect_ctx_rcs(const struct
> >> intel_context *ce, u32 *cs)
> >> cs, GEN12_GFX_CCS_AUX_NV);
> >> /* Wa_16014892111 */
> >> - if (IS_MTL_GRAPHICS_STEP(ce->engine->i915, M, STEP_A0, STEP_B0)
> >> ||
> >> - IS_MTL_GRAPHICS_STEP(ce->engine->i915, P, STEP_A0, STEP_B0)
> >> ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(ce->engine->i915, M, STEP_A0,
> >> STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(ce->engine->i915, P, STEP_A0,
> >> STEP_B0) ||
> >> IS_DG2(ce->engine->i915))
> >> cs = dg2_emit_draw_watermark_setting(cs);
> >> diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c
> >> b/drivers/gpu/drm/i915/gt/intel_rc6.c
> >> index 58bb1c55294c..cc8b09b8a7fa 100644
> >> --- a/drivers/gpu/drm/i915/gt/intel_rc6.c
> >> +++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
> >> @@ -526,7 +526,7 @@ static bool rc6_supported(struct intel_rc6 *rc6)
> >> return false;
> >> }
> >> - if (IS_MTL_MEDIA_STEP(gt->i915, STEP_A0, STEP_B0) &&
> >> + if (IS_METEORLAKE_MEDIA_STEP(gt->i915, STEP_A0, STEP_B0) &&
> >> gt->type == GT_MEDIA) {
> >> drm_notice(&i915->drm,
> >> "Media RC6 disabled on A step\n"); diff --git
> >> a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> >> b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> >> index 2337bc52d9f1..10a4e0fc23ec 100644
> >> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> >> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> >> @@ -819,8 +819,8 @@ static void mtl_ctx_gt_tuning_init(struct
> >> intel_engine_cs *engine,
> >> dg2_ctx_gt_tuning_init(engine, wal);
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_B0, STEP_FOREVER) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_B0, STEP_FOREVER))
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_B0, STEP_FOREVER)
> >> +||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_B0, STEP_FOREVER))
> >> wa_add(wal, DRAW_WATERMARK, VERT_WM_VAL, 0x3FF, 0, false);
> >> }
> >> @@ -831,8 +831,8 @@ static void mtl_ctx_workarounds_init(struct
> >> intel_engine_cs *engine,
> >> mtl_ctx_gt_tuning_init(engine, wal);
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0)) {
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0)) {
> >> /* Wa_14014947963 */
> >> wa_masked_field_set(wal, VF_PREEMPTION,
> >> PREEMPTION_VERTEX_COUNT, 0x4000); @@ -1716,8
> >> +1716,8 @@ xelpg_gt_workarounds_init(struct intel_gt *gt, struct
> >> i915_wa_list *wal)
> >> /* Wa_22016670082 */
> >> wa_write_or(wal, GEN12_SQCNT1, GEN12_STRICT_RAR_ENABLE);
> >> - if (IS_MTL_GRAPHICS_STEP(gt->i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(gt->i915, P, STEP_A0, STEP_B0)) {
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(gt->i915, M, STEP_A0, STEP_B0)
> >> +||
> >> + IS_METEORLAKE_GRAPHICS_STEP(gt->i915, P, STEP_A0, STEP_B0))
> >> +{
> >> /* Wa_14014830051 */
> >> wa_mcr_write_clr(wal, SARB_CHICKEN1, COMP_CKN_IN); @@
> >> -2413,15 +2413,15 @@ rcs_engine_wa_init(struct intel_engine_cs
> >> *engine, struct i915_wa_list *wal)
> >> {
> >> struct drm_i915_private *i915 = engine->i915;
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0)) {
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0)) {
> >> /* Wa_22014600077 */
> >> wa_mcr_masked_en(wal, GEN10_CACHE_MODE_SS,
> >> ENABLE_EU_COUNT_FOR_TDL_FLUSH);
> >> }
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> IS_DG2_GRAPHICS_STEP(i915, G10, STEP_B0, STEP_FOREVER) ||
> >> IS_DG2_G11(i915) || IS_DG2_G12(i915)) {
> >> /* Wa_1509727124 */
> >> @@ -2431,7 +2431,7 @@ rcs_engine_wa_init(struct intel_engine_cs
> >> *engine, struct i915_wa_list *wal)
> >> if (IS_DG2_GRAPHICS_STEP(i915, G10, STEP_B0, STEP_FOREVER) ||
> >> IS_DG2_G11(i915) || IS_DG2_G12(i915) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0)) {
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0)) {
> >> /* Wa_22012856258 */
> >> wa_mcr_masked_en(wal, GEN8_ROW_CHICKEN2,
> >> GEN12_DISABLE_READ_SUPPRESSION); @@ -3016,13
> >> +3016,13 @@ general_render_compute_wa_init(struct
> >> intel_engine_cs *engine, struct i915_wa_li
> >> GEN11_INDIRECT_STATE_BASE_ADDR_OVERRIDE);
> >> }
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_B0, STEP_FOREVER) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_B0, STEP_FOREVER))
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_B0, STEP_FOREVER)
> >> +||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_B0, STEP_FOREVER))
> >> /* Wa_14017856879 */
> >> wa_mcr_masked_en(wal, GEN9_ROW_CHICKEN3,
> >> MTL_DISABLE_FIX_FOR_EOT_FLUSH);
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> /*
> >> * Wa_14017066071
> >> * Wa_14017654203
> >> @@ -3030,13 +3030,13 @@ general_render_compute_wa_init(struct
> >> intel_engine_cs *engine, struct i915_wa_li
> >> wa_mcr_masked_en(wal, GEN10_SAMPLER_MODE,
> >> MTL_DISABLE_SAMPLER_SC_OOO);
> >> - if (IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> >> /* Wa_22015279794 */
> >> wa_mcr_masked_en(wal, GEN10_CACHE_MODE_SS,
> >> DISABLE_PREFETCH_INTO_IC);
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> IS_DG2_GRAPHICS_STEP(i915, G10, STEP_B0, STEP_FOREVER) ||
> >> IS_DG2_G11(i915) || IS_DG2_G12(i915)) {
> >> /* Wa_22013037850 */
> >> @@ -3044,16 +3044,16 @@ general_render_compute_wa_init(struct
> >> intel_engine_cs *engine, struct i915_wa_li
> >> DISABLE_128B_EVICTION_COMMAND_UDW);
> >> }
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> IS_PONTEVECCHIO(i915) ||
> >> IS_DG2(i915)) {
> >> /* Wa_22014226127 */
> >> wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0,
> >> DISABLE_D8_D16_COASLESCE);
> >> }
> >> - if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> - IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> >> + IS_METEORLAKE_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0) ||
> >> IS_DG2(i915)) {
> >> /* Wa_18017747507 */
> >> wa_masked_en(wal, VFG_PREEMPTION_CHICKEN,
> >> POLYGON_TRIFAN_LINELOOP_DISABLE); diff --git
> >> a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> >> b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> >> index 2eb891b270ae..3af0fcd7dd57 100644
> >> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> >> @@ -277,7 +277,7 @@ static u32 guc_ctl_wa_flags(struct intel_guc
> >> *guc)
> >> flags |= GUC_WA_GAM_CREDITS;
> >> /* Wa_14014475959 */
> >> - if (IS_MTL_GRAPHICS_STEP(gt->i915, M, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(gt->i915, M, STEP_A0, STEP_B0)
> >> +||
> >> IS_DG2(gt->i915))
> >> flags |= GUC_WA_HOLD_CCS_SWITCHOUT; @@ -292,7 +292,7 @@
> >> static u32 guc_ctl_wa_flags(struct intel_guc *guc)
> >> flags |= GUC_WA_DUAL_QUEUE;
> >> /* Wa_22011802037: graphics version 11/12 */
> >> - if (IS_MTL_GRAPHICS_STEP(gt->i915, M, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(gt->i915, M, STEP_A0, STEP_B0)
> >> +||
> >> (GRAPHICS_VER(gt->i915) >= 11 &&
> >> GRAPHICS_VER_FULL(gt->i915) < IP_VER(12, 70)))
> >> flags |= GUC_WA_PRE_PARSER; diff --git
> >> a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> >> b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> >> index a0e3ef1c65d2..5914c7348aba 100644
> >> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> >> @@ -1658,7 +1658,7 @@ static void guc_engine_reset_prepare(struct
> >> intel_engine_cs *engine)
> >> * Wa_22011802037: In addition to stopping the cs, we need
> >> * to wait for any pending mi force wakeups
> >> */
> >> - if (IS_MTL_GRAPHICS_STEP(engine->i915, M, STEP_A0, STEP_B0) ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(engine->i915, M, STEP_A0,
> >> STEP_B0) ||
> >> (GRAPHICS_VER(engine->i915) >= 11 &&
> >> GRAPHICS_VER_FULL(engine->i915) < IP_VER(12, 70))) {
> >> intel_engine_stop_cs(engine); @@ -4267,7 +4267,7 @@ static
> >> void guc_default_vfuncs(struct intel_engine_cs *engine)
> >> /* Wa_14014475959:dg2 */
> >> if (engine->class == COMPUTE_CLASS)
> >> - if (IS_MTL_GRAPHICS_STEP(engine->i915, M, STEP_A0, STEP_B0)
> >> ||
> >> + if (IS_METEORLAKE_GRAPHICS_STEP(engine->i915, M, STEP_A0,
> >> STEP_B0) ||
> >> IS_DG2(engine->i915))
> >> engine->flags |=
> >> I915_ENGINE_USES_WA_HOLD_CCS_SWITCHOUT;
> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h
> >> b/drivers/gpu/drm/i915/i915_drv.h index ef828e7de2ec..c6ad78381dd1
> >> 100644
> >> --- a/drivers/gpu/drm/i915/i915_drv.h
> >> +++ b/drivers/gpu/drm/i915/i915_drv.h
> >> @@ -688,15 +688,15 @@ IS_SUBPLATFORM(const struct drm_i915_private
> >> *i915,
> >> #define IS_XEHPSDV_GRAPHICS_STEP(__i915, since, until) \
> >> (IS_XEHPSDV(__i915) && IS_GRAPHICS_STEP(__i915, since, until))
> >> -#define IS_MTL_GRAPHICS_STEP(__i915, variant, since, until) \
> >> +#define IS_METEORLAKE_GRAPHICS_STEP(__i915, variant, since, until) \
> >> (IS_SUBPLATFORM(__i915, INTEL_METEORLAKE,
> >> INTEL_SUBPLATFORM_##variant) && \
> >> IS_GRAPHICS_STEP(__i915, since, until)) -#define
> >> IS_MTL_DISPLAY_STEP(__i915, since, until) \
> >> +#define IS_METEORLAKE_DISPLAY_STEP(__i915, since, until) \
> >> (IS_METEORLAKE(__i915) && \
> >> IS_DISPLAY_STEP(__i915, since, until)) -#define
> >> IS_MTL_MEDIA_STEP(__i915, since, until) \
> >> +#define IS_METEORLAKE_MEDIA_STEP(__i915, since, until) \
> >> (IS_METEORLAKE(__i915) && \
> >> IS_MEDIA_STEP(__i915, since, until)) diff --git
> >> a/drivers/gpu/drm/i915/i915_perf.c
> >> b/drivers/gpu/drm/i915/i915_perf.c
> >> index 0a111b281578..e943ffbaecbc 100644
> >> --- a/drivers/gpu/drm/i915/i915_perf.c
> >> +++ b/drivers/gpu/drm/i915/i915_perf.c
> >> @@ -4214,7 +4214,7 @@ static int read_properties_unlocked(struct
> >> i915_perf *perf,
> >> * C6 disable in BIOS. Fail if Media C6 is enabled on steppings
> >> where OAM
> >> * does not work as expected.
> >> */
> >> - if (IS_MTL_MEDIA_STEP(props->engine->i915, STEP_A0, STEP_C0) &&
> >> + if (IS_METEORLAKE_MEDIA_STEP(props->engine->i915, STEP_A0,
> >> STEP_C0) &&
> >> props->engine->oa_group->type == TYPE_OAM &&
> >> intel_check_bios_c6_setup(&props->engine->gt->rc6)) {
> >> drm_dbg(&perf->i915->drm,
> >> @@ -5322,7 +5322,7 @@ int i915_perf_ioctl_version(struct
> >> drm_i915_private *i915)
> >> * C6 disable in BIOS. If Media C6 is enabled in BIOS, return
> >> version 6
> >> * to indicate that OA media is not supported.
> >> */
> >> - if (IS_MTL_MEDIA_STEP(i915, STEP_A0, STEP_C0)) {
> >> + if (IS_METEORLAKE_MEDIA_STEP(i915, STEP_A0, STEP_C0)) {
> >> struct intel_gt *gt;
> >> int i;
