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/testdisplay.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/testdisplay.c')
| -rw-r--r-- | tests/testdisplay.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/testdisplay.c b/tests/testdisplay.c index 6d206e35..4efcb593 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -221,9 +221,8 @@ paint_color_key(struct igt_fb *fb_info) int i, j; uint32_t *fb_ptr; - fb_ptr = __gem_mmap__gtt(drm_fd, fb_info->gem_handle, - fb_info->size, PROT_READ | PROT_WRITE); - igt_assert(fb_ptr); + fb_ptr = gem_mmap__gtt(drm_fd, fb_info->gem_handle, fb_info->size, + PROT_READ | PROT_WRITE); for (i = crtc_y; i < crtc_y + crtc_h; i++) for (j = crtc_x; j < crtc_x + crtc_w; j++) { |