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/gen3_render_tiledy_blits.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/gen3_render_tiledy_blits.c')
| -rw-r--r-- | tests/gen3_render_tiledy_blits.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c index e90645ad..44e88d4d 100644 --- a/tests/gen3_render_tiledy_blits.c +++ b/tests/gen3_render_tiledy_blits.c @@ -301,8 +301,8 @@ create_bo(int fd, uint32_t val) gem_set_tiling(fd, handle, I915_TILING_Y, WIDTH*4); /* Fill the BO with dwords starting at val */ - v = __gem_mmap__gtt(fd, handle, WIDTH*HEIGHT*4, PROT_READ | PROT_WRITE); - igt_assert(v); + v = gem_mmap__gtt(fd, handle, WIDTH * HEIGHT * 4, + PROT_READ | PROT_WRITE); for (i = 0; i < WIDTH*HEIGHT; i++) v[i] = val++; munmap(v, WIDTH*HEIGHT*4); @@ -316,8 +316,7 @@ check_bo(int fd, uint32_t handle, uint32_t val) uint32_t *v; int i; - v = __gem_mmap__gtt(fd, handle, WIDTH*HEIGHT*4, PROT_READ); - igt_assert(v); + v = gem_mmap__gtt(fd, handle, WIDTH * HEIGHT * 4, PROT_READ); for (i = 0; i < WIDTH*HEIGHT; i++) { igt_assert_f(v[i] == val, "Expected 0x%08x, found 0x%08x " |