[Intel-gfx] [PATCH] drm/i915/selftests: Guard against redifinition of SZ_8G

Chris Wilson chris at chris-wilson.co.uk
Mon Jan 4 20:29:00 UTC 2021


Quoting Souza, Jose (2021-01-04 19:59:42)
> 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 at intel.com>
> 
> Will push this to fix build but from now on we probably want to remove this macro right?

I'd wait to remove our local SZ_8G until after we backmerge into drm-intel-gt-next.
Got to keep both sides of the merge building.
-Chris


More information about the Intel-gfx mailing list