OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/device: Return the right error for failed maps

Browse Source 
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Cc: "12.0 13.0" <mesa-dev@lists.freedesktop.org>
This commit is contained in:
Jason Ekstrand
2016-11-07 17:24:24 -08:00
parent 73ef9c8f04
commit 920f34a2d9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/intel/vulkan/anv_device.c
View File

@@ -24,6 +24,7 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@@ -1311,8 +1312,12 @@ VkResult anv_MapMemory(
/* Let's map whole pages */ /* Let's map whole pages */
map_size = align_u64(map_size, 4096); map_size = align_u64(map_size, 4096);
mem->map = anv_gem_mmap(device, mem->bo.gem_handle, void *map = anv_gem_mmap(device, mem->bo.gem_handle,
map_offset, map_size, gem_flags); map_offset, map_size, gem_flags);
if (map == MAP_FAILED)
return vk_error(VK_ERROR_MEMORY_MAP_FAILED);
mem->map = map;
mem->map_size = map_size; mem->map_size = map_size;
*ppData = mem->map + (offset - map_offset); *ppData = mem->map + (offset - map_offset);

6
src/intel/vulkan/anv_gem.c
View File

@@ -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); int ret = anv_ioctl(device->fd, DRM_IOCTL_I915_GEM_MMAP, &gem_mmap);
if (ret != 0) { if (ret != 0)
/* FIXME: Is NULL the right error return? Cf MAP_INVALID */ return MAP_FAILED;
return NULL;
}
VG(VALGRIND_MALLOCLIKE_BLOCK(gem_mmap.addr_ptr, gem_mmap.size, 0, 1)); VG(VALGRIND_MALLOCLIKE_BLOCK(gem_mmap.addr_ptr, gem_mmap.size, 0, 1));
return (void *)(uintptr_t) gem_mmap.addr_ptr; return (void *)(uintptr_t) gem_mmap.addr_ptr;