diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 19:11:39 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-12 19:57:58 +0300 |
| commit | f52e7ec7876603b4edb0bff412255f8f1624ecc4 (patch) | |
| tree | c8d668fd83f6f30c52c6ee0f89921299f0ad6eed /tests/gem_mmap_wc.c | |
| parent | b8a77dd6c8e9f73493b2f86f293ff9c06fc08049 (diff) | |
Replace __gem_mmap__{cpu,gtt,wc}() + igt_assert() with gem_mmap__{cpu,gtt,wc}()
gem_mmap__{cpu,gtt,wc}() already has the assert built in, so replace
__gem_mmap__{cpu,gtt,wc}() + igt_assert() with it.
Mostly done with coccinelle, with some manual help:
@@
identifier I;
expression E1, E2, E3, E4, E5, E6;
@@
(
- I = __gem_mmap__gtt(E1, E2, E3, E4);
+ I = gem_mmap__gtt(E1, E2, E3, E4);
...
- igt_assert(I);
|
- I = __gem_mmap__cpu(E1, E2, E3, E4, E5);
+ I = gem_mmap__cpu(E1, E2, E3, E4, E5);
...
- igt_assert(I);
|
- I = __gem_mmap__wc(E1, E2, E3, E4, E5);
+ I = gem_mmap__wc(E1, E2, E3, E4, E5);
...
- igt_assert(I);
)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Stochastically-reviwewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/gem_mmap_wc.c')
| -rw-r--r-- | tests/gem_mmap_wc.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/tests/gem_mmap_wc.c b/tests/gem_mmap_wc.c index 377749c5..91588a40 100644 --- a/tests/gem_mmap_wc.c +++ b/tests/gem_mmap_wc.c @@ -62,8 +62,7 @@ mmap_bo(int fd, uint32_t handle) { void *ptr; - ptr = __gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr); + ptr = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE); return ptr; } @@ -183,11 +182,9 @@ test_read_write2(int fd, enum test_read_write order) handle = gem_create(fd, OBJECT_SIZE); set_domain(fd, handle); - r = __gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ); - igt_assert(r); + r = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ); - w = __gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(w); + w = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE); if (order == READ_BEFORE_WRITE) { val = *(uint32_t *)r; @@ -288,11 +285,9 @@ test_write_cpu_read_wc(int fd, int force_domain) handle = gem_create(fd, OBJECT_SIZE); - dst = __gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ); - igt_assert(dst); + dst = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ); - src = __gem_mmap__cpu(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); - igt_assert(src); + src = gem_mmap__cpu(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); memset(src, 0xaa, OBJECT_SIZE); if (force_domain) @@ -315,11 +310,9 @@ test_write_gtt_read_wc(int fd) handle = gem_create(fd, OBJECT_SIZE); set_domain(fd, handle); - dst = __gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ); - igt_assert(dst); + dst = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ); - src = __gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_WRITE); - igt_assert(src); + src = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_WRITE); memset(src, 0xaa, OBJECT_SIZE); igt_assert(memcmp(dst, src, OBJECT_SIZE) == 0); |