> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Jani
> Nikula
> Sent: Monday, September 30, 2024 6:20 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Nikula, Jani <jani.nikula@xxxxxxxxx>
> Subject: [PATCH] drm/i915: remove all IS_<PLATFORM>_GT<N>() macros
>
> There aren't many users for the IS_<PLATFORM>_GT<N>() macros, and many of
> them are in fact unused. Even among the users, the platform check is often
> redundant. Just remove the macros.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@xxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/gt/gen7_renderclear.c | 3 ++-
> drivers/gpu/drm/i915/gt/intel_gt.c | 2 +-
> drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +--
> drivers/gpu/drm/i915/i915_drv.h | 29 ++-------------------
> drivers/gpu/drm/i915/intel_clock_gating.c | 2 +-
> 5 files changed, 8 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c
> b/drivers/gpu/drm/i915/gt/gen7_renderclear.c
> index d38b914d1206..6e89112f68ae 100644
> --- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c
> +++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c
> @@ -399,7 +399,8 @@ static void emit_batch(struct i915_vma * const vma,
> batch_add(&cmds, MI_LOAD_REGISTER_IMM(2));
> batch_add(&cmds, i915_mmio_reg_offset(CACHE_MODE_0_GEN7));
> batch_add(&cmds, 0xffff0000 |
> - ((IS_IVB_GT1(i915) || IS_VALLEYVIEW(i915)) ?
> + (((IS_IVYBRIDGE(i915) && INTEL_INFO(i915)->gt == 1)
> ||
> + IS_VALLEYVIEW(i915)) ?
> HIZ_RAW_STALL_OPT_DISABLE :
> 0));
> batch_add(&cmds, i915_mmio_reg_offset(CACHE_MODE_1));
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c
> b/drivers/gpu/drm/i915/gt/intel_gt.c
> index a6c69a706fd7..d6674aec82fc 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> @@ -185,7 +185,7 @@ int intel_gt_init_hw(struct intel_gt *gt)
> if (IS_HASWELL(i915))
> intel_uncore_write(uncore,
> HSW_MI_PREDICATE_RESULT_2,
> - IS_HASWELL_GT3(i915) ?
> + INTEL_INFO(i915)->gt == 3 ?
> LOWER_SLICE_ENABLED :
> LOWER_SLICE_DISABLED);
>
> /* Apply the GT workarounds... */
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index e539a656cfc3..60492c15893d 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -418,7 +418,7 @@ static void bdw_ctx_workarounds_init(struct
> intel_engine_cs *engine,
> /* WaForceContextSaveRestoreNonCoherent:bdw */
> HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |
> /* WaDisableFenceDestinationToSLM:bdw (pre-prod) */
> - (IS_BROADWELL_GT3(i915) ?
> HDC_FENCE_DEST_SLM_DISABLE : 0));
> + (INTEL_INFO(i915)->gt == 3 ?
> HDC_FENCE_DEST_SLM_DISABLE : 0));
> }
>
> static void chv_ctx_workarounds_init(struct intel_engine_cs *engine, @@ -
> 2537,7 +2537,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct
> i915_wa_list *wal)
> GEN7_FF_DS_SCHED_HW);
>
> /* WaDisablePSDDualDispatchEnable:ivb */
> - if (IS_IVB_GT1(i915))
> + if (INTEL_INFO(i915)->gt == 1)
> wa_masked_en(wal,
> GEN7_HALF_SLICE_CHICKEN1,
>
> GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE);
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index def3ca135406..49e03c9d38ba 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -507,8 +507,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> (IS_PLATFORM(i915, INTEL_IRONLAKE) && IS_MOBILE(i915)) #define
> IS_SANDYBRIDGE(i915) IS_PLATFORM(i915, INTEL_SANDYBRIDGE)
> #define IS_IVYBRIDGE(i915) IS_PLATFORM(i915, INTEL_IVYBRIDGE)
> -#define IS_IVB_GT1(i915) (IS_IVYBRIDGE(i915) && \
> - INTEL_INFO(i915)->gt == 1)
> #define IS_VALLEYVIEW(i915) IS_PLATFORM(i915, INTEL_VALLEYVIEW)
> #define IS_CHERRYVIEW(i915) IS_PLATFORM(i915, INTEL_CHERRYVIEW)
> #define IS_HASWELL(i915) IS_PLATFORM(i915, INTEL_HASWELL)
> @@ -561,14 +559,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> IS_SUBPLATFORM(i915, INTEL_BROADWELL,
> INTEL_SUBPLATFORM_ULT) #define IS_BROADWELL_ULX(i915) \
> IS_SUBPLATFORM(i915, INTEL_BROADWELL,
> INTEL_SUBPLATFORM_ULX)
> -#define IS_BROADWELL_GT3(i915) (IS_BROADWELL(i915) && \
> - INTEL_INFO(i915)->gt == 3)
> #define IS_HASWELL_ULT(i915) \
> IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULT)
> -#define IS_HASWELL_GT3(i915) (IS_HASWELL(i915) && \
> - INTEL_INFO(i915)->gt == 3)
> -#define IS_HASWELL_GT1(i915) (IS_HASWELL(i915) && \
> - INTEL_INFO(i915)->gt == 1)
> /* ULX machines are also considered ULT. */ #define IS_HASWELL_ULX(i915) \
> IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULX)
> @@ -580,31 +572,14 @@ IS_SUBPLATFORM(const struct drm_i915_private
> *i915,
> IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULT)
> #define IS_KABYLAKE_ULX(i915) \
> IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULX)
> -#define IS_SKYLAKE_GT2(i915) (IS_SKYLAKE(i915) && \
> - INTEL_INFO(i915)->gt == 2)
> -#define IS_SKYLAKE_GT3(i915) (IS_SKYLAKE(i915) && \
> - INTEL_INFO(i915)->gt == 3)
> -#define IS_SKYLAKE_GT4(i915) (IS_SKYLAKE(i915) && \
> - INTEL_INFO(i915)->gt == 4)
> -#define IS_KABYLAKE_GT2(i915) (IS_KABYLAKE(i915) && \
> - INTEL_INFO(i915)->gt == 2)
> -#define IS_KABYLAKE_GT3(i915) (IS_KABYLAKE(i915) && \
> - INTEL_INFO(i915)->gt == 3)
> #define IS_COFFEELAKE_ULT(i915) \
> IS_SUBPLATFORM(i915, INTEL_COFFEELAKE,
> INTEL_SUBPLATFORM_ULT) #define IS_COFFEELAKE_ULX(i915) \
> IS_SUBPLATFORM(i915, INTEL_COFFEELAKE,
> INTEL_SUBPLATFORM_ULX)
> -#define IS_COFFEELAKE_GT2(i915) (IS_COFFEELAKE(i915) && \
> - INTEL_INFO(i915)->gt == 2)
> -#define IS_COFFEELAKE_GT3(i915) (IS_COFFEELAKE(i915) && \
> - INTEL_INFO(i915)->gt == 3)
> -
> #define IS_COMETLAKE_ULT(i915) \
> IS_SUBPLATFORM(i915, INTEL_COMETLAKE,
> INTEL_SUBPLATFORM_ULT) #define IS_COMETLAKE_ULX(i915) \
> IS_SUBPLATFORM(i915, INTEL_COMETLAKE,
> INTEL_SUBPLATFORM_ULX)
> -#define IS_COMETLAKE_GT2(i915) (IS_COMETLAKE(i915) && \
> - INTEL_INFO(i915)->gt == 2)
>
> #define IS_ICL_WITH_PORT_F(i915) \
> IS_SUBPLATFORM(i915, INTEL_ICELAKE, INTEL_SUBPLATFORM_PORTF)
> @@ -678,7 +653,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
>
> /* WaRsDisableCoarsePowerGating:skl,cnl */
> #define NEEDS_WaRsDisableCoarsePowerGating(i915) \
> - (IS_SKYLAKE_GT3(i915) || IS_SKYLAKE_GT4(i915))
> + (IS_SKYLAKE(i915) && (INTEL_INFO(i915)->gt == 3 ||
> +INTEL_INFO(i915)->gt == 4))
>
> /* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte
> * rows, which changed the alignment requirements and fence programming.
> @@ -739,7 +714,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
>
> /* DPF == dynamic parity feature */
> #define HAS_L3_DPF(i915) (INTEL_INFO(i915)->has_l3_dpf) -#define
> NUM_L3_SLICES(i915) (IS_HASWELL_GT3(i915) ? \
> +#define NUM_L3_SLICES(i915) (IS_HASWELL(i915) && INTEL_INFO(i915)->gt
> +== 3 ? \
> 2 : HAS_L3_DPF(i915))
>
> #define HAS_GUC_DEPRIVILEGE(i915) \
> diff --git a/drivers/gpu/drm/i915/intel_clock_gating.c
> b/drivers/gpu/drm/i915/intel_clock_gating.c
> index 26c4dbda076e..f76642886569 100644
> --- a/drivers/gpu/drm/i915/intel_clock_gating.c
> +++ b/drivers/gpu/drm/i915/intel_clock_gating.c
> @@ -502,7 +502,7 @@ static void ivb_init_clock_gating(struct drm_i915_private
> *i915)
> CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE |
> CHICKEN3_DGMG_DONE_FIX_DISABLE);
>
> - if (IS_IVB_GT1(i915))
> + if (INTEL_INFO(i915)->gt == 1)
> intel_uncore_write(&i915->uncore, GEN7_ROW_CHICKEN2,
>
> _MASKED_BIT_ENABLE(DOP_CLOCK_GATING_DISABLE));
> else {
> --
> 2.39.5
