flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-21 13:23:02 +00:00
Code Issues Releases Wiki Activity

Remove gem_mmap__{cpu,gtt,wc} return value MAP_FAILED asserts

Browse Source 
gem_mmap__{cpu,gtt,wc} never return MAP_FAILED, it gets converted to
NULL internally. So don't go asserting that the returned value is
not MAP_FAILED.

Done with coccinelle:
@@
type T;
identifier I;
@@
(
 I = gem_mmap__gtt(...);
|
 I = gem_mmap__cpu(...);
|
 I = gem_mmap__wc(...);
)
 ...
(
- igt_assert(I != MAP_FAILED);
+ igt_assert(I);
|
- igt_assert(I && I != MAP_FAILED);
+ igt_assert(I);
|
- igt_assert(I != (T *) MAP_FAILED);
+ igt_assert(I);
|
- igt_assert(I != NULL);
+ igt_assert(I);
)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Stochastically-reviwewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Ville Syrjälä
2015-10-09 17:00:29 +03:00
parent 8986bbc0ce
commit 91d295cf06
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/gem_concurrent_all.c
+6 -6
View File
@@ -472,9 +472,9 @@ static void cpu_copy_bo(drm_intel_bo *dst, drm_intel_bo *src)
gem_set_domain(fd, src->handle, I915_GEM_DOMAIN_CPU, 0);
gem_set_domain(fd, dst->handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
s = gem_mmap__cpu(fd, src->handle, 0, size, PROT_READ);
igt_assert(s != NULL);
igt_assert(s);
d = gem_mmap__cpu(fd, dst->handle, 0, size, PROT_WRITE);
igt_assert(d != NULL);
igt_assert(d);
memcpy(d, s, size);
@@ -491,9 +491,9 @@ static void gtt_copy_bo(drm_intel_bo *dst, drm_intel_bo *src)
gem_set_domain(fd, dst->handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
s = gem_mmap__gtt(fd, src->handle, size, PROT_READ);
igt_assert(s != NULL);
igt_assert(s);
d = gem_mmap__gtt(fd, dst->handle, size, PROT_WRITE);
igt_assert(d != NULL);
igt_assert(d);
memcpy(d, s, size);
@@ -510,9 +510,9 @@ static void wc_copy_bo(drm_intel_bo *dst, drm_intel_bo *src)
gem_set_domain(fd, dst->handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
s = gem_mmap__wc(fd, src->handle, 0, size, PROT_READ);
igt_assert(s != NULL);
igt_assert(s);
d = gem_mmap__wc(fd, dst->handle, 0, size, PROT_WRITE);
igt_assert(d != NULL);
igt_assert(d);
memcpy(d, s, size);