OSDN Git Service

Distinguish COMPOSER_TARGET_BUFFER
[android-x86/external-minigbm.git] / vc4.c
diff --git a/vc4.c b/vc4.c
index 06b3ed7..5ea4bc3 100644 (file)
--- a/vc4.c
+++ b/vc4.c
 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)
 {
        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);
 }
 
@@ -34,7 +46,7 @@ static int vc4_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t he
        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:
@@ -54,12 +66,11 @@ static int vc4_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t he
        stride = ALIGN(stride, 64);
        drv_bo_from_format(bo, stride, height, format);
 
-       memset(&bo_create, 0, sizeof(bo_create));
        bo_create.size = bo->meta.total_size;
 
        ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VC4_CREATE_BO, &bo_create);
        if (ret) {
-               drv_log("DRM_IOCTL_VC4_GEM_CREATE failed (size=%zu)\n", bo->meta.total_size);
+               drv_log("DRM_IOCTL_VC4_CREATE_BO failed (size=%zu)\n", bo->meta.total_size);
                return -errno;
        }
 
@@ -97,11 +108,9 @@ static int vc4_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t
 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) {
                drv_log("DRM_VC4_MMAP_BO failed\n");