On Wed, 2026-03-04 at 16:40 +0200, Jani Nikula wrote: > Remove the xe_step macro, and use the enum intel_step name directly. > > Signed-off-by: Jani Nikula <[email protected]> > ---
Reviewed-by: Luca Coelho <[email protected]> -- Cheers, Luca. > drivers/gpu/drm/xe/tests/xe_pci.c | 4 ++-- > drivers/gpu/drm/xe/xe_step.c | 2 +- > drivers/gpu/drm/xe/xe_step.h | 4 ++-- > drivers/gpu/drm/xe/xe_step_types.h | 2 -- > 4 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/xe/tests/xe_pci.c > b/drivers/gpu/drm/xe/tests/xe_pci.c > index f3179b31f13e..860409c579f8 100644 > --- a/drivers/gpu/drm/xe/tests/xe_pci.c > +++ b/drivers/gpu/drm/xe/tests/xe_pci.c > @@ -131,12 +131,12 @@ static const char *subplatform_prefix(enum > xe_subplatform s) > return s == XE_SUBPLATFORM_NONE ? "" : " "; > } > > -static const char *step_prefix(enum xe_step step) > +static const char *step_prefix(enum intel_step step) > { > return step == STEP_NONE ? "" : " "; > } > > -static const char *step_name(enum xe_step step) > +static const char *step_name(enum intel_step step) > { > return step == STEP_NONE ? "" : xe_step_name(step); > } > diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c > index 2860986f82f7..e021da35b03c 100644 > --- a/drivers/gpu/drm/xe/xe_step.c > +++ b/drivers/gpu/drm/xe/xe_step.c > @@ -248,7 +248,7 @@ struct xe_step_info xe_step_gmdid_get(struct xe_device > *xe, > case STEP_##name: \ > return #name; > > -const char *xe_step_name(enum xe_step step) > +const char *xe_step_name(enum intel_step step) > { > switch (step) { > STEP_NAME_LIST(STEP_NAME_CASE); > diff --git a/drivers/gpu/drm/xe/xe_step.h b/drivers/gpu/drm/xe/xe_step.h > index 686cb59200c2..6fd680c1b45e 100644 > --- a/drivers/gpu/drm/xe/xe_step.h > +++ b/drivers/gpu/drm/xe/xe_step.h > @@ -16,8 +16,8 @@ struct xe_step_info xe_step_pre_gmdid_get(struct xe_device > *xe); > struct xe_step_info xe_step_gmdid_get(struct xe_device *xe, > u32 graphics_gmdid_revid, > u32 media_gmdid_revid); > -static inline u32 xe_step_to_gmdid(enum xe_step step) { return step - > STEP_A0; } > +static inline u32 xe_step_to_gmdid(enum intel_step step) { return step - > STEP_A0; } > > -const char *xe_step_name(enum xe_step step); > +const char *xe_step_name(enum intel_step step); > > #endif > diff --git a/drivers/gpu/drm/xe/xe_step_types.h > b/drivers/gpu/drm/xe/xe_step_types.h > index bc3ed5a8282a..bd9a7a44a67f 100644 > --- a/drivers/gpu/drm/xe/xe_step_types.h > +++ b/drivers/gpu/drm/xe/xe_step_types.h > @@ -10,8 +10,6 @@ > > #include <drm/intel/step.h> > > -#define xe_step intel_step > - > struct xe_step_info { > u8 graphics; > u8 media;
