summaryrefslogtreecommitdiffstats
path: root/src/intel/vulkan/anv_gem.c
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2017-01-09 00:30:27 +0800
committerChih-Wei Huang <cwhuang@linux.org.tw>2017-01-09 00:30:27 +0800
commite123ad753c152491c07a5cc6d346f62624b07949 (patch)
tree9095413f68d7d91a7dfc1b18ead20ef5616b43d6 /src/intel/vulkan/anv_gem.c
parentdffabc025cca524fecb7a03d0f65ec9c628025f8 (diff)
parentc8ece92ded9337b9ed60aa9568b41313025a1406 (diff)
downloadexternal_mesa3d-e123ad753c152491c07a5cc6d346f62624b07949.zip
external_mesa3d-e123ad753c152491c07a5cc6d346f62624b07949.tar.gz
external_mesa3d-e123ad753c152491c07a5cc6d346f62624b07949.tar.bz2
Merge remote-tracking branch 'mesa/13.0' into nougat-x86
Diffstat (limited to 'src/intel/vulkan/anv_gem.c')
-rw-r--r--src/intel/vulkan/anv_gem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index e654689..0dde6d9 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
@@ -88,10 +88,8 @@ anv_gem_mmap(struct anv_device *device, uint32_t gem_handle,
};
int ret = anv_ioctl(device->fd, DRM_IOCTL_I915_GEM_MMAP, &gem_mmap);
- if (ret != 0) {
- /* FIXME: Is NULL the right error return? Cf MAP_INVALID */
- return NULL;
- }
+ if (ret != 0)
+ return MAP_FAILED;
VG(VALGRIND_MALLOCLIKE_BLOCK(gem_mmap.addr_ptr, gem_mmap.size, 0, 1));
return (void *)(uintptr_t) gem_mmap.addr_ptr;