From 7eaae3c2013b6d4bdf11570d3fb9d95eb4978976 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 9 Oct 2015 18:19:34 +0300 Subject: Sprinkle igt_assert(ptr) after gem_mmap__{cpu,gtt,wc} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do the following ptr = gem_mmap__{cpu,gtt,wc}() +igt_assert(ptr); whenever the code doesn't handle the NULL ptr in any kind of specific way. Makes it easier to move the assert into gem_mmap__{cpu,gtt,wc}() itself. Mostly done with coccinelle, with some manual cleanups: @@ identifier I; @@ <... when != igt_assert(I) when != igt_require(I) when != igt_require_f(I, ...) when != I != NULL when != I == NULL ( I = gem_mmap__gtt(...); + igt_assert(I); | I = gem_mmap__cpu(...); + igt_assert(I); | I = gem_mmap__wc(...); + igt_assert(I); ) ...> Signed-off-by: Ville Syrjälä Stochastically-reviwewed-by: Chris Wilson --- tests/kms_fence_pin_leak.c | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/kms_fence_pin_leak.c') diff --git a/tests/kms_fence_pin_leak.c b/tests/kms_fence_pin_leak.c index 7d4ffbcd..0f5d3644 100644 --- a/tests/kms_fence_pin_leak.c +++ b/tests/kms_fence_pin_leak.c @@ -90,6 +90,7 @@ static void touch_fences(data_t *data) void *ptr; ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE); + igt_assert(ptr); gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); memset(ptr, 0, 4); munmap(ptr, 4096); -- cgit v1.2.3