| Message ID | b3d4119c030c2cf9f127b02a42c32aeb24787296.1615211711.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: refactor KBL/TGL/ADLS stepping scheme | expand |
On Mon, 2021-03-08 at 15:56 +0200, Jani Nikula wrote: > Matter of taste. Match the prefix for everything else related to > steppings. No functional changes. Reviewed-by: José Roberto de Souza <jose.souza@intel.com> For the renaming patches, 6, 7 and 8 I'm also fine with the current naming up to you. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_device_info.h | 2 +- > drivers/gpu/drm/i915/intel_step.c | 12 ++++++------ > drivers/gpu/drm/i915/intel_step.h | 2 +- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h > index f84569e8e711..1bcae2a8c79b 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -228,7 +228,7 @@ struct intel_runtime_info { > > > > > u32 rawclk_freq; > > > > > - struct i915_rev_steppings step; > + struct intel_step_info step; > }; > > > > > struct intel_driver_caps { > diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c > index 9df2dd264841..914a5de4346e 100644 > --- a/drivers/gpu/drm/i915/intel_step.c > +++ b/drivers/gpu/drm/i915/intel_step.c > @@ -15,7 +15,7 @@ > > > > > > > > > /* FIXME: what about REVID_E0 */ > -static const struct i915_rev_steppings kbl_revids[] = { > +static const struct intel_step_info kbl_revids[] = { > [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, > [1] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, > [2] = { .gt_step = STEP_C0, .display_step = STEP_B0 }, > @@ -26,7 +26,7 @@ static const struct i915_rev_steppings kbl_revids[] = { > [7] = { .gt_step = STEP_G0, .display_step = STEP_C0 }, > }; > > > > > -static const struct i915_rev_steppings tgl_uy_revid_step_tbl[] = { > +static const struct intel_step_info tgl_uy_revid_step_tbl[] = { > [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 i915_rev_steppings tgl_uy_revid_step_tbl[] = { > }; > > > > > /* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */ > -static const struct i915_rev_steppings tgl_revid_step_tbl[] = { > +static const struct intel_step_info tgl_revid_step_tbl[] = { > [0] = { .gt_step = STEP_A0, .display_step = STEP_B0 }, > [1] = { .gt_step = STEP_B0, .display_step = STEP_D0 }, > }; > > > > > -static const struct i915_rev_steppings adls_revid_step_tbl[] = { > +static const struct intel_step_info adls_revid_step_tbl[] = { > [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 }, > @@ -49,10 +49,10 @@ static const struct i915_rev_steppings adls_revid_step_tbl[] = { > > > > > void intel_step_init(struct drm_i915_private *i915) > { > - const struct i915_rev_steppings *revids = NULL; > + const struct intel_step_info *revids = NULL; > int size = 0; > int revid = INTEL_REVID(i915); > - struct i915_rev_steppings step = {}; > + struct intel_step_info step = {}; > > > > > if (IS_ALDERLAKE_S(i915)) { > revids = adls_revid_step_tbl; > diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h > index 102fd6a26893..958a8bb5d677 100644 > --- a/drivers/gpu/drm/i915/intel_step.h > +++ b/drivers/gpu/drm/i915/intel_step.h > @@ -10,7 +10,7 @@ > > > > > struct drm_i915_private; > > > > > -struct i915_rev_steppings { > +struct intel_step_info { > u8 gt_step; > u8 display_step; > };
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index f84569e8e711..1bcae2a8c79b 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -228,7 +228,7 @@ struct intel_runtime_info { u32 rawclk_freq; - struct i915_rev_steppings step; + struct intel_step_info step; }; struct intel_driver_caps { diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c index 9df2dd264841..914a5de4346e 100644 --- a/drivers/gpu/drm/i915/intel_step.c +++ b/drivers/gpu/drm/i915/intel_step.c @@ -15,7 +15,7 @@ /* FIXME: what about REVID_E0 */ -static const struct i915_rev_steppings kbl_revids[] = { +static const struct intel_step_info kbl_revids[] = { [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, [1] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, [2] = { .gt_step = STEP_C0, .display_step = STEP_B0 }, @@ -26,7 +26,7 @@ static const struct i915_rev_steppings kbl_revids[] = { [7] = { .gt_step = STEP_G0, .display_step = STEP_C0 }, }; -static const struct i915_rev_steppings tgl_uy_revid_step_tbl[] = { +static const struct intel_step_info tgl_uy_revid_step_tbl[] = { [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 i915_rev_steppings tgl_uy_revid_step_tbl[] = { }; /* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */ -static const struct i915_rev_steppings tgl_revid_step_tbl[] = { +static const struct intel_step_info tgl_revid_step_tbl[] = { [0] = { .gt_step = STEP_A0, .display_step = STEP_B0 }, [1] = { .gt_step = STEP_B0, .display_step = STEP_D0 }, }; -static const struct i915_rev_steppings adls_revid_step_tbl[] = { +static const struct intel_step_info adls_revid_step_tbl[] = { [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 }, @@ -49,10 +49,10 @@ static const struct i915_rev_steppings adls_revid_step_tbl[] = { void intel_step_init(struct drm_i915_private *i915) { - const struct i915_rev_steppings *revids = NULL; + const struct intel_step_info *revids = NULL; int size = 0; int revid = INTEL_REVID(i915); - struct i915_rev_steppings step = {}; + struct intel_step_info step = {}; if (IS_ALDERLAKE_S(i915)) { revids = adls_revid_step_tbl; diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h index 102fd6a26893..958a8bb5d677 100644 --- a/drivers/gpu/drm/i915/intel_step.h +++ b/drivers/gpu/drm/i915/intel_step.h @@ -10,7 +10,7 @@ struct drm_i915_private; -struct i915_rev_steppings { +struct intel_step_info { u8 gt_step; u8 display_step; };
Matter of taste. Match the prefix for everything else related to steppings. No functional changes. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_device_info.h | 2 +- drivers/gpu/drm/i915/intel_step.c | 12 ++++++------ drivers/gpu/drm/i915/intel_step.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)