Commit bf3997a5 authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Guard against redifinition of SZ_8G

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.

References: 8b0fac44 ("sizes.h: add SZ_8G/SZ_16G/SZ_32G macros")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210104171511.32684-1-chris@chris-wilson.co.uk
parent 2b277991
...@@ -352,7 +352,9 @@ static int igt_mock_splintered_region(void *arg) ...@@ -352,7 +352,9 @@ static int igt_mock_splintered_region(void *arg)
return err; return err;
} }
#ifndef SZ_8G
#define SZ_8G BIT_ULL(33) #define SZ_8G BIT_ULL(33)
#endif
static int igt_mock_max_segment(void *arg) static int igt_mock_max_segment(void *arg)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment