Update Android.bp after merge

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

diff --git a/vc4.c b/vc4.c
index 99896b9..5ea4bc3 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>
@@ -19,24 +20,43 @@
 static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
                                                  DRM_FORMAT_XRGB8888 };
 
+static const uint32_t texture_only_formats[] = { DRM_FORMAT_NV12, DRM_FORMAT_YVU420 };
+
 static int vc4_init(struct driver *drv)
 {
-       int ret;
-       ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
-                                  &LINEAR_METADATA, BO_USE_RENDER_MASK);
-       if (ret)
-               return ret;
+       drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+                            &LINEAR_METADATA, BO_USE_RENDER_MASK);
+
+       drv_add_combinations(drv, texture_only_formats, ARRAY_SIZE(texture_only_formats),
+                            &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
+       /*
+        * Chrome uses DMA-buf mmap to write to YV12 buffers, which are then accessed by the
+        * Video Encoder Accelerator (VEA). It could also support NV12 potentially in the future.
+        */
+       drv_modify_combination(drv, DRM_FORMAT_YVU420, &LINEAR_METADATA, BO_USE_HW_VIDEO_ENCODER);
+       drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA,
+                              BO_USE_HW_VIDEO_DECODER | BO_USE_SCANOUT | BO_USE_HW_VIDEO_ENCODER);
 
        return drv_modify_linear_combinations(drv);
 }
 
-static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                        uint32_t flags)
+static int vc4_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t height,
+                                     uint32_t format, uint64_t modifier)
 {
        int ret;
        size_t plane;
        uint32_t stride;
-       struct drm_vc4_create_bo bo_create;
+       struct drm_vc4_create_bo bo_create = { 0 };
+
+       switch (modifier) {
+       case DRM_FORMAT_MOD_LINEAR:
+               break;
+       case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED:
+               drv_log("DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED not supported yet\n");
+               return -EINVAL;
+       default:
+               return -EINVAL;
+       }
 
        /*
         * Since the ARM L1 cache line size is 64 bytes, align to that as a
@@ -46,49 +66,71 @@ static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_
        stride = ALIGN(stride, 64);
        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_CREATE_BO 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;
 }
 
-static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane)
+static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+                        uint64_t use_flags)
+{
+       struct combination *combo;
+
+       combo = drv_get_combination(bo->drv, format, use_flags);
+       if (!combo)
+               return -EINVAL;
+
+       return vc4_bo_create_for_modifier(bo, width, height, format, combo->metadata.modifier);
+}
+
+static int vc4_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t height,
+                                       uint32_t format, const uint64_t *modifiers, uint32_t count)
+{
+       static const uint64_t modifier_order[] = {
+               DRM_FORMAT_MOD_LINEAR,
+       };
+       uint64_t modifier;
+
+       modifier = drv_pick_modifier(modifiers, count, modifier_order, ARRAY_SIZE(modifier_order));
+
+       return vc4_bo_create_for_modifier(bo, width, height, format, modifier);
+}
+
+static void *vc4_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags)
 {
        int ret;
-       struct drm_vc4_mmap_bo bo_map;
+       struct drm_vc4_mmap_bo bo_map = { 0 };
 
-       memset(&bo_map, 0, sizeof(bo_map));
        bo_map.handle = bo->handles[0].u32;
-
        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;
        }
 
-       data->length = bo->total_size;
-
-       return mmap(0, bo->total_size, PROT_READ | PROT_WRITE, 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);
 }
 
-struct backend backend_vc4 = {
+const struct backend backend_vc4 = {
        .name = "vc4",
        .init = vc4_init,
        .bo_create = vc4_bo_create,
+       .bo_create_with_modifiers = vc4_bo_create_with_modifiers,
        .bo_import = drv_prime_bo_import,
        .bo_destroy = drv_gem_bo_destroy,
        .bo_map = vc4_bo_map,
+       .bo_unmap = drv_bo_munmap,
 };
 
 #endif