diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 18:29:28 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 19:16:26 +0300 |
| commit | b8a77dd6c8e9f73493b2f86f293ff9c06fc08049 (patch) | |
| tree | 7e43c045f1ff755144818b71b6d89942667c3565 /tests/pm_rpm.c | |
| parent | 106fe21373f9c3eadcd95fb4b48e452f9b328ffa (diff) | |
Make gem_mmap__{cpu,gtt,wc}() assert on failure
Rename the current gem_mmap__{cpu,gtt,wc}() functions into
__gem_mmap__{cpu,gtt,wc}(), and add back wrappers with the original name
that assert that the pointer is valid. Most callers will expect a valid
pointer and shouldn't have to bother with failures.
To avoid changing anything (yet), sed 's/gem_mmap__/__gem_mmap__/g'
over the entire codebase.
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/pm_rpm.c')
| -rw-r--r-- | tests/pm_rpm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index 026220ba..7c3e7ca2 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -973,12 +973,12 @@ static void gem_mmap_subtest(bool gtt_mmap) handle = gem_create(drm_fd, buf_size); if (gtt_mmap) { - gem_buf = gem_mmap__gtt(drm_fd, handle, buf_size, + gem_buf = __gem_mmap__gtt(drm_fd, handle, buf_size, PROT_READ | PROT_WRITE); igt_assert(gem_buf); } else { - gem_buf = gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0); + gem_buf = __gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0); igt_assert(gem_buf); } @@ -1012,12 +1012,12 @@ static void gem_mmap_subtest(bool gtt_mmap) disable_all_screens_and_wait(&ms_data); if (gtt_mmap) { - gem_buf = gem_mmap__gtt(drm_fd, handle, buf_size, + gem_buf = __gem_mmap__gtt(drm_fd, handle, buf_size, PROT_READ | PROT_WRITE); igt_assert(gem_buf); } else { - gem_buf = gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0); + gem_buf = __gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0); igt_assert(gem_buf); } @@ -1474,7 +1474,7 @@ static void fill_igt_fb(struct igt_fb *fb, uint32_t color) int i; uint32_t *ptr; - ptr = gem_mmap__gtt(drm_fd, fb->gem_handle, fb->size, PROT_WRITE); + ptr = __gem_mmap__gtt(drm_fd, fb->gem_handle, fb->size, PROT_WRITE); igt_assert(ptr); for (i = 0; i < fb->size/sizeof(uint32_t); i++) ptr[i] = color; @@ -1756,7 +1756,7 @@ static void fences_subtest(bool dpms) gem_get_tiling(drm_fd, params.fb.gem_handle, &tiling, &swizzle); igt_assert(tiling); - buf_ptr = gem_mmap__gtt(drm_fd, params.fb.gem_handle, + buf_ptr = __gem_mmap__gtt(drm_fd, params.fb.gem_handle, params.fb.size, PROT_WRITE | PROT_READ); igt_assert(buf_ptr); for (i = 0; i < params.fb.size/sizeof(uint32_t); i++) |