On Fri, 2017-09-08 at 12:39 +0300, Jani Nikula wrote: > On Fri, 08 Sep 2017, Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> wrote: > > Split INTEL_GEN_MASK out of IS_GEN macro, and make it usable > > within static declarations (unlike combound statements). > > > > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > > --- > > drivers/gpu/drm/i915/i915_drv.h | 22 ++++++++++------------ > > 1 file changed, 10 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index 63ca2ffcafef..c3f9d7d7b146 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -2873,23 +2873,21 @@ intel_info(const struct drm_i915_private *dev_priv) > > #define INTEL_REVID(dev_priv) ((dev_priv)->drm.pdev->revision) > > > > #define GEN_FOREVER (0) > > + > > +#define INTEL_GEN_MASK(s, e) ( \ > > + BUILD_BUG_ON_ZERO(!__builtin_constant_p(s)) + \ > > + BUILD_BUG_ON_ZERO(!__builtin_constant_p(e)) + \ > > + GENMASK((e) != GEN_FOREVER ? (e) - 1 : BITS_PER_LONG - 1, \ > > + (s) != GEN_FOREVER ? (s) - 1 : 0) \ > > Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > but I'd really like a patch on top to remove the -1 from here and > info->gen_mask. I'll add it. Regards, Joonas -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx