On Mon, Sep 30, 2024 at 03:31:04PM +0300, Jani Nikula wrote: > We'll be needing a macro based list of platforms for more things in the > future. Start by defining the platform enumerations with it. > > Signed-off-by: Jani Nikula <[email protected]> > --- > .../drm/i915/display/intel_display_device.h | 115 ++++++++++-------- > 1 file changed, 61 insertions(+), 54 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h > b/drivers/gpu/drm/i915/display/intel_display_device.h > index 5306bbd13e59..1cc1a2de9e6a 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.h > +++ b/drivers/gpu/drm/i915/display/intel_display_device.h > @@ -15,63 +15,70 @@ struct drm_i915_private; > struct drm_printer; > > /* Keep in gen based order, and chronological order within a gen */ > +#define INTEL_DISPLAY_PLATFORMS(func) \ > + func(PLATFORM_UNINITIALIZED) \ > + /* Display ver 2 */ \ > + func(I830) \ > + func(I845G) \ > + func(I85X) \ > + func(I865G) \ > + /* Display ver 3 */ \ > + func(I915G) \ > + func(I915GM) \ > + func(I945G) \ > + func(I945GM) \ > + func(G33) \ > + func(PINEVIEW) \ > + /* Display ver 4 */ \ > + func(I965G) \ > + func(I965GM) \ > + func(G45) \ > + func(GM45) \ > + /* Display ver 5 */ \ > + func(IRONLAKE) \ > + /* Display ver 6 */ \ > + func(SANDYBRIDGE) \ > + /* Display ver 7 */ \ > + func(IVYBRIDGE) \ > + func(VALLEYVIEW) \ > + func(HASWELL) \ > + /* Display ver 8 */ \ > + func(BROADWELL) \ > + func(CHERRYVIEW) \ > + /* Display ver 9 */ \ > + func(SKYLAKE) \ > + func(BROXTON) \ > + func(KABYLAKE) \ > + func(GEMINILAKE) \ > + func(COFFEELAKE) \ > + func(COMETLAKE) \ > + /* Display ver 11 */ \ > + func(ICELAKE) \ > + func(JASPERLAKE) \ > + func(ELKHARTLAKE) \ > + /* Display ver 12 */ \ > + func(TIGERLAKE) \ > + func(ROCKETLAKE) \ > + func(DG1) \ > + func(ALDERLAKE_S) \ > + /* Display ver 13 */ \ > + func(ALDERLAKE_P) \ > + func(DG2) \ > + /* Display ver 14 (based on GMD ID) */ \ > + func(METEORLAKE) \ > + /* Display ver 20 (based on GMD ID) */ \ > + func(LUNARLAKE) \ > + /* Display ver 14.1 (based on GMD ID) */ \ > + func(BATTLEMAGE) > + > +#define __ENUM(x) INTEL_DISPLAY_ ## x, > + > enum intel_display_platform { > - INTEL_DISPLAY_PLATFORM_UNINITIALIZED = 0, > - /* Display ver 2 */ > - INTEL_DISPLAY_I830, > - INTEL_DISPLAY_I845G, > - INTEL_DISPLAY_I85X, > - INTEL_DISPLAY_I865G, > - /* Display ver 3 */ > - INTEL_DISPLAY_I915G, > - INTEL_DISPLAY_I915GM, > - INTEL_DISPLAY_I945G, > - INTEL_DISPLAY_I945GM, > - INTEL_DISPLAY_G33, > - INTEL_DISPLAY_PINEVIEW, > - /* Display ver 4 */ > - INTEL_DISPLAY_I965G, > - INTEL_DISPLAY_I965GM, > - INTEL_DISPLAY_G45, > - INTEL_DISPLAY_GM45, > - /* Display ver 5 */ > - INTEL_DISPLAY_IRONLAKE, > - /* Display ver 6 */ > - INTEL_DISPLAY_SANDYBRIDGE, > - /* Display ver 7 */ > - INTEL_DISPLAY_IVYBRIDGE, > - INTEL_DISPLAY_VALLEYVIEW, > - INTEL_DISPLAY_HASWELL, > - /* Display ver 8 */ > - INTEL_DISPLAY_BROADWELL, > - INTEL_DISPLAY_CHERRYVIEW, > - /* Display ver 9 */ > - INTEL_DISPLAY_SKYLAKE, > - INTEL_DISPLAY_BROXTON, > - INTEL_DISPLAY_KABYLAKE, > - INTEL_DISPLAY_GEMINILAKE, > - INTEL_DISPLAY_COFFEELAKE, > - INTEL_DISPLAY_COMETLAKE, > - /* Display ver 11 */ > - INTEL_DISPLAY_ICELAKE, > - INTEL_DISPLAY_JASPERLAKE, > - INTEL_DISPLAY_ELKHARTLAKE, > - /* Display ver 12 */ > - INTEL_DISPLAY_TIGERLAKE, > - INTEL_DISPLAY_ROCKETLAKE, > - INTEL_DISPLAY_DG1, > - INTEL_DISPLAY_ALDERLAKE_S, > - /* Display ver 13 */ > - INTEL_DISPLAY_ALDERLAKE_P, > - INTEL_DISPLAY_DG2, > - /* Display ver 14 (based on GMD ID) */ > - INTEL_DISPLAY_METEORLAKE, > - /* Display ver 20 (based on GMD ID) */ > - INTEL_DISPLAY_LUNARLAKE, > - /* Display ver 14.1 (based on GMD ID) */ > - INTEL_DISPLAY_BATTLEMAGE, > + INTEL_DISPLAY_PLATFORMS(__ENUM)
these func macros gets me confused so easily, but I believe everything looks okay here and I'm trusting your compiler and experiments more. And I don't believe the CI issues could be root caused here, so Reviewed-by: Rodrigo Vivi <[email protected]> > }; > > +#undef __ENUM > + > enum intel_display_subplatform { > INTEL_DISPLAY_SUBPLATFORM_UNINITIALIZED = 0, > INTEL_DISPLAY_HASWELL_ULT, > -- > 2.39.5 >
