On Wed, 2026-03-04 at 16:40 +0200, Jani Nikula wrote: > As the first step towards using shared definitions for step name > enumerations, add shared include/drm/intel/step.h and switch i915 to use > it. > > Signed-off-by: Jani Nikula <[email protected]> > ---
Reviewed-by: Luca Coelho <[email protected]> -- Cheers, Luca. > drivers/gpu/drm/i915/intel_step.h | 57 +--------------------------- > include/drm/intel/step.h | 62 +++++++++++++++++++++++++++++++ > 2 files changed, 64 insertions(+), 55 deletions(-) > create mode 100644 include/drm/intel/step.h > > diff --git a/drivers/gpu/drm/i915/intel_step.h > b/drivers/gpu/drm/i915/intel_step.h > index 22f1d6905160..2ca36eae4b5a 100644 > --- a/drivers/gpu/drm/i915/intel_step.h > +++ b/drivers/gpu/drm/i915/intel_step.h > @@ -8,6 +8,8 @@ > > #include <linux/types.h> > > +#include <drm/intel/step.h> > + > struct drm_i915_private; > > struct intel_step_info { > @@ -19,61 +21,6 @@ struct intel_step_info { > u8 media_step; > }; > > -#define STEP_ENUM_VAL(name) STEP_##name, > - > -#define STEP_NAME_LIST(func) \ > - func(A0) \ > - func(A1) \ > - func(A2) \ > - func(A3) \ > - func(B0) \ > - func(B1) \ > - func(B2) \ > - func(B3) \ > - func(C0) \ > - func(C1) \ > - func(C2) \ > - func(C3) \ > - func(D0) \ > - func(D1) \ > - func(D2) \ > - func(D3) \ > - func(E0) \ > - func(E1) \ > - func(E2) \ > - func(E3) \ > - func(F0) \ > - func(F1) \ > - func(F2) \ > - func(F3) \ > - func(G0) \ > - func(G1) \ > - func(G2) \ > - func(G3) \ > - func(H0) \ > - func(H1) \ > - func(H2) \ > - func(H3) \ > - func(I0) \ > - func(I1) \ > - func(I2) \ > - func(I3) \ > - func(J0) \ > - func(J1) \ > - func(J2) \ > - func(J3) > - > -/* > - * Symbolic steppings that do not match the hardware. These are valid both > as gt > - * and display steppings as symbolic names. > - */ > -enum intel_step { > - STEP_NONE = 0, > - STEP_NAME_LIST(STEP_ENUM_VAL) > - STEP_FUTURE, > - STEP_FOREVER, > -}; > - > void intel_step_init(struct drm_i915_private *i915); > const char *intel_step_name(enum intel_step step); > > diff --git a/include/drm/intel/step.h b/include/drm/intel/step.h > new file mode 100644 > index 000000000000..4de7520109bc > --- /dev/null > +++ b/include/drm/intel/step.h > @@ -0,0 +1,62 @@ > +/* SPDX-License-Identifier: MIT */ > +/* Copyright © 2026 Intel Corporation */ > + > +#ifndef __STEP_H__ > +#define __STEP_H__ > + > +#define STEP_ENUM_VAL(name) STEP_##name, > + > +#define STEP_NAME_LIST(func) \ > + func(A0) \ > + func(A1) \ > + func(A2) \ > + func(A3) \ > + func(B0) \ > + func(B1) \ > + func(B2) \ > + func(B3) \ > + func(C0) \ > + func(C1) \ > + func(C2) \ > + func(C3) \ > + func(D0) \ > + func(D1) \ > + func(D2) \ > + func(D3) \ > + func(E0) \ > + func(E1) \ > + func(E2) \ > + func(E3) \ > + func(F0) \ > + func(F1) \ > + func(F2) \ > + func(F3) \ > + func(G0) \ > + func(G1) \ > + func(G2) \ > + func(G3) \ > + func(H0) \ > + func(H1) \ > + func(H2) \ > + func(H3) \ > + func(I0) \ > + func(I1) \ > + func(I2) \ > + func(I3) \ > + func(J0) \ > + func(J1) \ > + func(J2) \ > + func(J3) > + > +/* > + * Symbolic steppings that do not match the hardware. These are valid both > as gt > + * and display steppings as symbolic names. > + */ > +enum intel_step { > + STEP_NONE = 0, > + STEP_NAME_LIST(STEP_ENUM_VAL) > + STEP_FUTURE, > + STEP_FOREVER, > +}; > + > +#endif /* __STEP_H__ */
