| Message ID | 20210707050645.31043-2-anusha.srivatsa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Abstract steppings for all platforms | expand |
On Tue, 06 Jul 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote: > Simplify the stepping info array name. > > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_step.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c > index ba9479a67521..93ccd42f2514 100644 > --- a/drivers/gpu/drm/i915/intel_step.c > +++ b/drivers/gpu/drm/i915/intel_step.c > @@ -26,7 +26,7 @@ static const struct intel_step_info kbl_revids[] = { > [7] = { .gt_step = STEP_G0, .display_step = STEP_C0 }, > }; > > -static const struct intel_step_info tgl_uy_revid_step_tbl[] = { > +static const struct intel_step_info tgl_uy_revids[] = { > [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, > [1] = { .gt_step = STEP_B0, .display_step = STEP_C0 }, > [2] = { .gt_step = STEP_B1, .display_step = STEP_C0 }, > @@ -34,12 +34,12 @@ static const struct intel_step_info tgl_uy_revid_step_tbl[] = { > }; > > /* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */ > -static const struct intel_step_info tgl_revid_step_tbl[] = { > +static const struct intel_step_info tgl_revids[] = { > [0] = { .gt_step = STEP_A0, .display_step = STEP_B0 }, > [1] = { .gt_step = STEP_B0, .display_step = STEP_D0 }, > }; > > -static const struct intel_step_info adls_revid_step_tbl[] = { > +static const struct intel_step_info adls_revids[] = { > [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, > [0x1] = { .gt_step = STEP_A0, .display_step = STEP_A2 }, > [0x4] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, > @@ -47,7 +47,7 @@ static const struct intel_step_info adls_revid_step_tbl[] = { > [0xC] = { .gt_step = STEP_D0, .display_step = STEP_C0 }, > }; > > -static const struct intel_step_info adlp_revid_step_tbl[] = { > +static const struct intel_step_info adlp_revids[] = { > [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, > [0x4] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, > [0x8] = { .gt_step = STEP_C0, .display_step = STEP_C0 }, > @@ -62,17 +62,17 @@ void intel_step_init(struct drm_i915_private *i915) > struct intel_step_info step = {}; > > if (IS_ALDERLAKE_P(i915)) { > - revids = adlp_revid_step_tbl; > - size = ARRAY_SIZE(adlp_revid_step_tbl); > + revids = adlp_revids; > + size = ARRAY_SIZE(adlp_revids); > } else if (IS_ALDERLAKE_S(i915)) { > - revids = adls_revid_step_tbl; > - size = ARRAY_SIZE(adls_revid_step_tbl); > + revids = adls_revids; > + size = ARRAY_SIZE(adls_revids); > } else if (IS_TGL_U(i915) || IS_TGL_Y(i915)) { > - revids = tgl_uy_revid_step_tbl; > - size = ARRAY_SIZE(tgl_uy_revid_step_tbl); > + revids = tgl_uy_revids; > + size = ARRAY_SIZE(tgl_uy_revids); > } else if (IS_TIGERLAKE(i915)) { > - revids = tgl_revid_step_tbl; > - size = ARRAY_SIZE(tgl_revid_step_tbl); > + revids = tgl_revids; > + size = ARRAY_SIZE(tgl_revids); > } else if (IS_KABYLAKE(i915)) { > revids = kbl_revids; > size = ARRAY_SIZE(kbl_revids);
diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c index ba9479a67521..93ccd42f2514 100644 --- a/drivers/gpu/drm/i915/intel_step.c +++ b/drivers/gpu/drm/i915/intel_step.c @@ -26,7 +26,7 @@ static const struct intel_step_info kbl_revids[] = { [7] = { .gt_step = STEP_G0, .display_step = STEP_C0 }, }; -static const struct intel_step_info tgl_uy_revid_step_tbl[] = { +static const struct intel_step_info tgl_uy_revids[] = { [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, [1] = { .gt_step = STEP_B0, .display_step = STEP_C0 }, [2] = { .gt_step = STEP_B1, .display_step = STEP_C0 }, @@ -34,12 +34,12 @@ static const struct intel_step_info tgl_uy_revid_step_tbl[] = { }; /* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */ -static const struct intel_step_info tgl_revid_step_tbl[] = { +static const struct intel_step_info tgl_revids[] = { [0] = { .gt_step = STEP_A0, .display_step = STEP_B0 }, [1] = { .gt_step = STEP_B0, .display_step = STEP_D0 }, }; -static const struct intel_step_info adls_revid_step_tbl[] = { +static const struct intel_step_info adls_revids[] = { [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, [0x1] = { .gt_step = STEP_A0, .display_step = STEP_A2 }, [0x4] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, @@ -47,7 +47,7 @@ static const struct intel_step_info adls_revid_step_tbl[] = { [0xC] = { .gt_step = STEP_D0, .display_step = STEP_C0 }, }; -static const struct intel_step_info adlp_revid_step_tbl[] = { +static const struct intel_step_info adlp_revids[] = { [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, [0x4] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, [0x8] = { .gt_step = STEP_C0, .display_step = STEP_C0 }, @@ -62,17 +62,17 @@ void intel_step_init(struct drm_i915_private *i915) struct intel_step_info step = {}; if (IS_ALDERLAKE_P(i915)) { - revids = adlp_revid_step_tbl; - size = ARRAY_SIZE(adlp_revid_step_tbl); + revids = adlp_revids; + size = ARRAY_SIZE(adlp_revids); } else if (IS_ALDERLAKE_S(i915)) { - revids = adls_revid_step_tbl; - size = ARRAY_SIZE(adls_revid_step_tbl); + revids = adls_revids; + size = ARRAY_SIZE(adls_revids); } else if (IS_TGL_U(i915) || IS_TGL_Y(i915)) { - revids = tgl_uy_revid_step_tbl; - size = ARRAY_SIZE(tgl_uy_revid_step_tbl); + revids = tgl_uy_revids; + size = ARRAY_SIZE(tgl_uy_revids); } else if (IS_TIGERLAKE(i915)) { - revids = tgl_revid_step_tbl; - size = ARRAY_SIZE(tgl_revid_step_tbl); + revids = tgl_revids; + size = ARRAY_SIZE(tgl_revids); } else if (IS_KABYLAKE(i915)) { revids = kbl_revids; size = ARRAY_SIZE(kbl_revids);
Simplify the stepping info array name. Cc: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/intel_step.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)