Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev' am: 3c53003fca am: 273579e674

[android-x86/external-minigbm.git] / vc4.c

diff --git a/vc4.c b/vc4.c
index 7960247..7af16c2 100644 (file)
--- a/vc4.c
+++ b/vc4.c
@@ -6,6 +6,7 @@
 
 #ifdef DRV_VC4
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
@@ -44,16 +45,15 @@ static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_
        drv_bo_from_format(bo, stride, height, format);
 
        memset(&bo_create, 0, sizeof(bo_create));
-       bo_create.size = bo->total_size;
+       bo_create.size = bo->meta.total_size;
 
        ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VC4_CREATE_BO, &bo_create);
        if (ret) {
-               fprintf(stderr, "drv: DRM_IOCTL_VC4_GEM_CREATE failed (size=%zu)\n",
-                       bo->total_size);
-               return ret;
+               drv_log("DRM_IOCTL_VC4_GEM_CREATE failed (size=%zu)\n", bo->meta.total_size);
+               return -errno;
        }
 
-       for (plane = 0; plane < bo->num_planes; plane++)
+       for (plane = 0; plane < bo->meta.num_planes; plane++)
                bo->handles[plane].u32 = bo_create.handle;
 
        return 0;
@@ -69,12 +69,12 @@ static void *vc4_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t m
 
        ret = drmCommandWriteRead(bo->drv->fd, DRM_VC4_MMAP_BO, &bo_map, sizeof(bo_map));
        if (ret) {
-               fprintf(stderr, "drv: DRM_VC4_MMAP_BO failed\n");
+               drv_log("DRM_VC4_MMAP_BO failed\n");
                return MAP_FAILED;
        }
 
-       vma->length = bo->total_size;
-       return mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
+       vma->length = bo->meta.total_size;
+       return mmap(NULL, bo->meta.total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
                    bo_map.offset);
 }