On Wed, 2026-03-04 at 16:40 +0200, Jani Nikula wrote: > Use the shared stepping enums from include/drm/intel/step.h. > > For now, define xe_step as intel_step to avoid mass renames at the same > time. For compat, we can remove the reverse macro. > > Signed-off-by: Jani Nikula <[email protected]> > ---
Reviewed-by: Luca Coelho <[email protected]> -- Cheers, Luca. > .../drm/xe/compat-i915-headers/intel_step.h | 4 +- > drivers/gpu/drm/xe/xe_step_types.h | 63 ++----------------- > 2 files changed, 5 insertions(+), 62 deletions(-) > > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > b/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > index 0eabe2866f5f..cb55a659856b 100644 > --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > +++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_step.h > @@ -6,8 +6,6 @@ > #ifndef __INTEL_STEP_H__ > #define __INTEL_STEP_H__ > > -#include "xe_step_types.h" > - > -#define intel_step xe_step > +#include <drm/intel/step.h> > > #endif /* __INTEL_STEP_H__ */ > diff --git a/drivers/gpu/drm/xe/xe_step_types.h > b/drivers/gpu/drm/xe/xe_step_types.h > index d978cc2512f2..bc3ed5a8282a 100644 > --- a/drivers/gpu/drm/xe/xe_step_types.h > +++ b/drivers/gpu/drm/xe/xe_step_types.h > @@ -8,69 +8,14 @@ > > #include <linux/types.h> > > +#include <drm/intel/step.h> > + > +#define xe_step intel_step > + > struct xe_step_info { > u8 graphics; > u8 media; > u8 basedie; > }; > > -#define STEP_ENUM_VAL(name) STEP_##name, > - > -/* > - * Always define four minor steppings 0-3 for each stepping to match GMD ID > - * spacing of values. See xe_step_gmdid_get(). > - */ > -#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 xe_step { > - STEP_NONE = 0, > - STEP_NAME_LIST(STEP_ENUM_VAL) > - STEP_FUTURE, > - STEP_FOREVER, > -}; > - > #endif
