On Tue, Aug 20, 2024 at 10:00:42PM +0300, Jani Nikula wrote: > The code is now unused. Remove. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/intel_step.c | 79 ++++++++++++++----------------- > drivers/gpu/drm/i915/intel_step.h | 1 - > 2 files changed, 36 insertions(+), 44 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_step.c > b/drivers/gpu/drm/i915/intel_step.c > index 80464e4edcce..285b96fadfd5 100644 > --- a/drivers/gpu/drm/i915/intel_step.c > +++ b/drivers/gpu/drm/i915/intel_step.c > @@ -23,8 +23,7 @@ > * use a macro to define these to make it easier to identify the platforms > * where the two steppings can deviate. > */ > -#define COMMON_STEP(x) .graphics_step = STEP_##x, .display_step = STEP_##x, > .media_step = STEP_##x > -#define COMMON_GT_MEDIA_STEP(x) .graphics_step = STEP_##x, .media_step = > STEP_##x > +#define COMMON_STEP(x) .graphics_step = STEP_##x, .media_step = STEP_##x > > static const struct intel_step_info skl_revids[] = { > [0x6] = { COMMON_STEP(G0) }, > @@ -34,13 +33,13 @@ static const struct intel_step_info skl_revids[] = { > }; > > static const struct intel_step_info kbl_revids[] = { > - [1] = { COMMON_GT_MEDIA_STEP(B0), .display_step = STEP_B0 }, > - [2] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_B0 }, > - [3] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_B0 }, > - [4] = { COMMON_GT_MEDIA_STEP(F0), .display_step = STEP_C0 }, > - [5] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_B1 }, > - [6] = { COMMON_GT_MEDIA_STEP(D1), .display_step = STEP_B1 }, > - [7] = { COMMON_GT_MEDIA_STEP(G0), .display_step = STEP_C0 }, > + [1] = { COMMON_STEP(B0) }, > + [2] = { COMMON_STEP(C0) }, > + [3] = { COMMON_STEP(D0) }, > + [4] = { COMMON_STEP(F0) }, > + [5] = { COMMON_STEP(C0) }, > + [6] = { COMMON_STEP(D1) }, > + [7] = { COMMON_STEP(G0) }, > }; > > static const struct intel_step_info bxt_revids[] = { > @@ -64,16 +63,16 @@ static const struct intel_step_info jsl_ehl_revids[] = { > }; > > static const struct intel_step_info tgl_uy_revids[] = { > - [0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_A0 }, > - [1] = { COMMON_GT_MEDIA_STEP(B0), .display_step = STEP_C0 }, > - [2] = { COMMON_GT_MEDIA_STEP(B1), .display_step = STEP_C0 }, > - [3] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_D0 }, > + [0] = { COMMON_STEP(A0) }, > + [1] = { COMMON_STEP(B0) }, > + [2] = { COMMON_STEP(B1) }, > + [3] = { COMMON_STEP(C0) }, > }; > > /* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same > HW */ > static const struct intel_step_info tgl_revids[] = { > - [0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_B0 }, > - [1] = { COMMON_GT_MEDIA_STEP(B0), .display_step = STEP_D0 }, > + [0] = { COMMON_STEP(A0) }, > + [1] = { COMMON_STEP(B0) }, > }; > > static const struct intel_step_info rkl_revids[] = { > @@ -88,49 +87,49 @@ static const struct intel_step_info dg1_revids[] = { > }; > > static const struct intel_step_info adls_revids[] = { > - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_A0 }, > - [0x1] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_A2 }, > - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display_step = STEP_B0 }, > - [0x8] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_B0 }, > - [0xC] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_C0 }, > + [0x0] = { COMMON_STEP(A0) }, > + [0x1] = { COMMON_STEP(A0) }, > + [0x4] = { COMMON_STEP(B0) }, > + [0x8] = { COMMON_STEP(C0) }, > + [0xC] = { COMMON_STEP(D0) }, > }; > > static const struct intel_step_info adlp_revids[] = { > - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_A0 }, > - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display_step = STEP_B0 }, > - [0x8] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_C0 }, > - [0xC] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_D0 }, > + [0x0] = { COMMON_STEP(A0) }, > + [0x4] = { COMMON_STEP(B0) }, > + [0x8] = { COMMON_STEP(C0) }, > + [0xC] = { COMMON_STEP(C0) }, > }; > > static const struct intel_step_info dg2_g10_revid_step_tbl[] = { > - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_A0 }, > - [0x1] = { COMMON_GT_MEDIA_STEP(A1), .display_step = STEP_A0 }, > - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display_step = STEP_B0 }, > - [0x8] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_C0 }, > + [0x0] = { COMMON_STEP(A0) }, > + [0x1] = { COMMON_STEP(A1) }, > + [0x4] = { COMMON_STEP(B0) }, > + [0x8] = { COMMON_STEP(C0) }, > }; > > static const struct intel_step_info dg2_g11_revid_step_tbl[] = { > - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_B0 }, > - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display_step = STEP_C0 }, > - [0x5] = { COMMON_GT_MEDIA_STEP(B1), .display_step = STEP_C0 }, > + [0x0] = { COMMON_STEP(A0) }, > + [0x4] = { COMMON_STEP(B0) }, > + [0x5] = { COMMON_STEP(B1) }, > }; > > static const struct intel_step_info dg2_g12_revid_step_tbl[] = { > - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_C0 }, > - [0x1] = { COMMON_GT_MEDIA_STEP(A1), .display_step = STEP_C0 }, > + [0x0] = { COMMON_STEP(A0) }, > + [0x1] = { COMMON_STEP(A1) }, > }; > > static const struct intel_step_info adls_rpls_revids[] = { > - [0x4] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_D0 }, > - [0xC] = { COMMON_GT_MEDIA_STEP(D0), .display_step = STEP_C0 }, > + [0x4] = { COMMON_STEP(D0) }, > + [0xC] = { COMMON_STEP(D0) }, > }; > > static const struct intel_step_info adlp_rplp_revids[] = { > - [0x4] = { COMMON_GT_MEDIA_STEP(C0), .display_step = STEP_E0 }, > + [0x4] = { COMMON_STEP(C0) }, > }; > > static const struct intel_step_info adlp_n_revids[] = { > - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display_step = STEP_D0 }, > + [0x0] = { COMMON_STEP(A0) }, > }; > > static u8 gmd_to_intel_step(struct drm_i915_private *i915, > @@ -158,11 +157,6 @@ void intel_step_init(struct drm_i915_private *i915) > > &RUNTIME_INFO(i915)->graphics.ip); > step.media_step = gmd_to_intel_step(i915, > > &RUNTIME_INFO(i915)->media.ip); > - step.display_step = STEP_A0 + > DISPLAY_RUNTIME_INFO(i915)->ip.step; > - if (step.display_step >= STEP_FUTURE) { > - drm_dbg(&i915->drm, "Using future display steppings\n"); > - step.display_step = STEP_FUTURE; > - } > > RUNTIME_INFO(i915)->step = step; > > @@ -252,7 +246,6 @@ void intel_step_init(struct drm_i915_private *i915) > } else { > drm_dbg(&i915->drm, "Using future steppings\n"); > step.graphics_step = STEP_FUTURE; > - step.display_step = STEP_FUTURE; > } > } > > diff --git a/drivers/gpu/drm/i915/intel_step.h > b/drivers/gpu/drm/i915/intel_step.h > index 96dfca4cba73..83bd1190edf5 100644 > --- a/drivers/gpu/drm/i915/intel_step.h > +++ b/drivers/gpu/drm/i915/intel_step.h > @@ -16,7 +16,6 @@ struct intel_step_info { > * the expectation breaks gmd_to_intel_step(). > */ > u8 graphics_step; /* Represents the compute tile on Xe_HPC */ > - u8 display_step; > u8 media_step; > u8 basedie_step; > }; > -- > 2.39.2 > -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
