From f52e7ec7876603b4edb0bff412255f8f1624ecc4 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 9 Oct 2015 19:11:39 +0300 Subject: Replace __gem_mmap__{cpu,gtt,wc}() + igt_assert() with gem_mmap__{cpu,gtt,wc}() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Stochastically-reviwewed-by: Chris Wilson --- tests/testdisplay.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/testdisplay.c') 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++) { -- cgit v1.2.3