On Mon, 2021-01-04 at 17:13 +0000, Chris Wilson wrote: > In the near future, upstream will introduce a SZ_8G macro that is > slightly different to our own. Employ a temporary ifndef to avoid > compilation failure until we have backmerged. Already here! Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx> Will push this to fix build but from now on we probably want to remove this macro right? > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/selftests/intel_memory_region.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c > index a55079a061dd..75839db63bea 100644 > --- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c > +++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c > @@ -352,7 +352,9 @@ static int igt_mock_splintered_region(void *arg) > return err; > } > > > > > +#ifndef SZ_8G > #define SZ_8G BIT_ULL(33) > +#endif > > > > > static int igt_mock_max_segment(void *arg) > { _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx