diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2021-01-04 17:15:11 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2021-01-04 20:31:06 +0000 |
| commit | bf3997a541525ac8cf06bb8f0daa639977d7f33e (patch) | |
| tree | c2b6ea6de10ce0c6b22323c84be50e75b1cf593e | |
| parent | 2b2779917a52136b87c8e0c9d1ba8efb7f5ea8e9 (diff) | |
| download | linux-bf3997a541525ac8cf06bb8f0daa639977d7f33e.tar.bz2 | |
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: 8b0fac44bd1f ("sizes.h: add SZ_8G/SZ_16G/SZ_32G macros")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210104171511.32684-1-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/intel_memory_region.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ out_put: return err; } +#ifndef SZ_8G #define SZ_8G BIT_ULL(33) +#endif static int igt_mock_max_segment(void *arg) { |