OSDN Git Service

minigbm: stop faking the protected buffers
[android-x86/external-minigbm.git] / rockchip.c
index 004ea77..9ef7962 100644 (file)
@@ -7,8 +7,8 @@
 #ifdef DRV_ROCKCHIP
 
 #include <errno.h>
+#include <inttypes.h>
 #include <rockchip_drm.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
@@ -23,12 +23,12 @@ struct rockchip_private_map_data {
        void *gem_addr;
 };
 
-static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
-                                                 DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
-                                                 DRM_FORMAT_XRGB8888 };
+static const uint32_t scanout_render_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
+                                                  DRM_FORMAT_BGR888,   DRM_FORMAT_RGB565,
+                                                  DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888 };
 
-static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_NV12,
-                                                  DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID };
+static const uint32_t texture_only_formats[] = { DRM_FORMAT_NV12, DRM_FORMAT_YVU420,
+                                                DRM_FORMAT_YVU420_ANDROID };
 
 static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, uint32_t format)
 {
@@ -63,100 +63,47 @@ static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, u
        const uint32_t body_plane_offset = ALIGN(header_plane_size, body_plane_alignment);
        const uint32_t total_size = body_plane_offset + body_plane_size;
 
-       bo->strides[0] = width_in_blocks * block_width * pixel_size;
-       bo->sizes[0] = total_size;
-       bo->offsets[0] = 0;
+       bo->meta.strides[0] = width_in_blocks * block_width * pixel_size;
+       bo->meta.sizes[0] = total_size;
+       bo->meta.offsets[0] = 0;
 
-       bo->total_size = total_size;
+       bo->meta.total_size = total_size;
 
-       bo->format_modifiers[0] = DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC;
-
-       return 0;
-}
-
-static int rockchip_add_kms_item(struct driver *drv, const struct kms_item *item)
-{
-       int ret;
-       uint32_t i, j;
-       uint64_t flags;
-       struct combination *combo;
-       struct format_metadata metadata;
-
-       for (i = 0; i < drv->combos.size; i++) {
-               combo = &drv->combos.data[i];
-               if (combo->format == item->format) {
-                       if (item->modifier == DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC) {
-                               flags = BO_USE_RENDERING | BO_USE_SCANOUT | BO_USE_TEXTURE;
-                               metadata.modifier = item->modifier;
-                               metadata.tiling = 0;
-                               metadata.priority = 2;
-
-                               for (j = 0; j < ARRAY_SIZE(texture_source_formats); j++) {
-                                       if (item->format == texture_source_formats[j])
-                                               flags &= ~BO_USE_RENDERING;
-                               }
-
-                               ret = drv_add_combination(drv, item[i].format, &metadata, flags);
-                               if (ret)
-                                       return ret;
-                       } else {
-                               combo->usage |= item->usage;
-                       }
-               }
-       }
+       bo->meta.format_modifiers[0] = DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC;
 
        return 0;
 }
 
 static int rockchip_init(struct driver *drv)
 {
-       int ret;
-       uint32_t i, num_items;
-       struct kms_item *items;
        struct format_metadata metadata;
 
        metadata.tiling = 0;
        metadata.priority = 1;
-       metadata.modifier = DRM_FORMAT_MOD_NONE;
-
-       ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
-                                  &metadata, BO_USE_RENDER_MASK);
-       if (ret)
-               return ret;
-
-       ret = drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
-                                  &metadata, BO_USE_TEXTURE_MASK);
-       if (ret)
-               return ret;
-
-       drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT);
-       drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT);
-
-       items = drv_query_kms(drv, &num_items);
-       if (!items || !num_items)
-               return 0;
-
-       for (i = 0; i < num_items; i++) {
-               ret = rockchip_add_kms_item(drv, &items[i]);
-               if (ret) {
-                       free(items);
-                       return ret;
-               }
-       }
+       metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
-       free(items);
-       return 0;
-}
+       drv_add_combinations(drv, scanout_render_formats, ARRAY_SIZE(scanout_render_formats),
+                            &metadata, BO_USE_RENDER_MASK | BO_USE_SCANOUT);
 
-static bool has_modifier(const uint64_t *list, uint32_t count, uint64_t modifier)
-{
-       uint32_t i;
+       drv_add_combinations(drv, texture_only_formats, ARRAY_SIZE(texture_only_formats), &metadata,
+                            BO_USE_TEXTURE_MASK);
+
+       /* NV12 format for camera, display, decoding and encoding. */
+       /* Camera ISP supports only NV12 output. */
+       drv_modify_combination(drv, DRM_FORMAT_NV12, &metadata,
+                              BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SCANOUT |
+                                  BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
 
-       for (i = 0; i < count; i++)
-               if (list[i] == modifier)
-                       return true;
+       drv_modify_linear_combinations(drv);
+       /*
+        * R8 format is used for Android's HAL_PIXEL_FORMAT_BLOB and is used for JPEG snapshots
+        * from camera and input/output from hardware decoder/encoder.
+        */
+       drv_add_combination(drv, DRM_FORMAT_R8, &metadata,
+                           BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SW_MASK |
+                               BO_USE_LINEAR | BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER);
 
-       return false;
+       return 0;
 }
 
 static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t height,
@@ -165,26 +112,30 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint
 {
        int ret;
        size_t plane;
-       struct drm_rockchip_gem_create gem_create;
+       struct drm_rockchip_gem_create gem_create = { 0 };
 
        if (format == DRM_FORMAT_NV12) {
-               uint32_t w_mbs = DIV_ROUND_UP(ALIGN(width, 16), 16);
-               uint32_t h_mbs = DIV_ROUND_UP(ALIGN(height, 16), 16);
+               uint32_t w_mbs = DIV_ROUND_UP(width, 16);
+               uint32_t h_mbs = DIV_ROUND_UP(height, 16);
 
                uint32_t aligned_width = w_mbs * 16;
-               uint32_t aligned_height = DIV_ROUND_UP(h_mbs * 16 * 3, 2);
+               uint32_t aligned_height = h_mbs * 16;
 
-               drv_bo_from_format(bo, aligned_width, height, format);
-               bo->total_size = bo->strides[0] * aligned_height + w_mbs * h_mbs * 128;
+               drv_bo_from_format(bo, aligned_width, aligned_height, format);
+               /*
+                * drv_bo_from_format updates total_size. Add an extra data space for rockchip video
+                * driver to store motion vectors.
+                */
+               bo->meta.total_size += w_mbs * h_mbs * 128;
        } else if (width <= 2560 &&
-                  has_modifier(modifiers, count, DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC)) {
+                  drv_has_modifier(modifiers, count, DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC)) {
                /* If the caller has decided they can use AFBC, always
                 * pick that */
                afbc_bo_from_format(bo, width, height, format);
        } else {
-               if (!has_modifier(modifiers, count, DRM_FORMAT_MOD_NONE)) {
+               if (!drv_has_modifier(modifiers, count, DRM_FORMAT_MOD_LINEAR)) {
                        errno = EINVAL;
-                       fprintf(stderr, "no usable modifier found\n");
+                       drv_log("no usable modifier found\n");
                        return -1;
                }
 
@@ -204,86 +155,102 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint
                drv_bo_from_format(bo, stride, height, format);
        }
 
-       memset(&gem_create, 0, sizeof(gem_create));
-       gem_create.size = bo->total_size;
-
+       gem_create.size = bo->meta.total_size;
        ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_CREATE, &gem_create);
 
        if (ret) {
-               fprintf(stderr, "drv: DRM_IOCTL_ROCKCHIP_GEM_CREATE failed (size=%llu)\n",
+               drv_log("DRM_IOCTL_ROCKCHIP_GEM_CREATE failed (size=%" PRIu64 ")\n",
                        gem_create.size);
-               return ret;
+               return -errno;
        }
 
-       for (plane = 0; plane < bo->num_planes; plane++)
+       for (plane = 0; plane < bo->meta.num_planes; plane++)
                bo->handles[plane].u32 = gem_create.handle;
 
        return 0;
 }
 
 static int rockchip_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                             uint32_t flags)
+                             uint64_t use_flags)
 {
-       uint64_t modifiers[] = { DRM_FORMAT_MOD_NONE };
-
+       uint64_t modifiers[] = { DRM_FORMAT_MOD_LINEAR };
        return rockchip_bo_create_with_modifiers(bo, width, height, format, modifiers,
                                                 ARRAY_SIZE(modifiers));
 }
 
-static void *rockchip_bo_map(struct bo *bo, struct map_info *data, size_t plane, int prot)
+static void *rockchip_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags)
 {
        int ret;
-       struct drm_rockchip_gem_map_off gem_map;
        struct rockchip_private_map_data *priv;
+       struct drm_rockchip_gem_map_off gem_map = { 0 };
 
        /* We can only map buffers created with SW access flags, which should
         * have no modifiers (ie, not AFBC). */
-       if (bo->format_modifiers[0] == DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC)
+       if (bo->meta.format_modifiers[0] == DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC)
                return MAP_FAILED;
 
-       memset(&gem_map, 0, sizeof(gem_map));
        gem_map.handle = bo->handles[0].u32;
-
        ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET, &gem_map);
        if (ret) {
-               fprintf(stderr, "drv: DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET failed\n");
+               drv_log("DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET failed\n");
                return MAP_FAILED;
        }
 
-       void *addr = mmap(0, bo->total_size, prot, MAP_SHARED, bo->drv->fd, gem_map.offset);
+       void *addr = mmap(0, bo->meta.total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
+                         gem_map.offset);
 
-       data->length = bo->total_size;
+       vma->length = bo->meta.total_size;
 
-       if (bo->flags & BO_USE_RENDERSCRIPT) {
+       if (bo->meta.use_flags & BO_USE_RENDERSCRIPT) {
                priv = calloc(1, sizeof(*priv));
-               priv->cached_addr = calloc(1, bo->total_size);
+               priv->cached_addr = calloc(1, bo->meta.total_size);
                priv->gem_addr = addr;
-               memcpy(priv->cached_addr, priv->gem_addr, bo->total_size);
-               data->priv = priv;
+               vma->priv = priv;
                addr = priv->cached_addr;
        }
 
        return addr;
 }
 
-static int rockchip_bo_unmap(struct bo *bo, struct map_info *data)
+static int rockchip_bo_unmap(struct bo *bo, struct vma *vma)
 {
-       if (data->priv) {
-               struct rockchip_private_map_data *priv = data->priv;
-               memcpy(priv->gem_addr, priv->cached_addr, bo->total_size);
-               data->addr = priv->gem_addr;
+       if (vma->priv) {
+               struct rockchip_private_map_data *priv = vma->priv;
+               vma->addr = priv->gem_addr;
                free(priv->cached_addr);
                free(priv);
-               data->priv = NULL;
+               vma->priv = NULL;
        }
 
-       return munmap(data->addr, data->length);
+       return munmap(vma->addr, vma->length);
+}
+
+static int rockchip_bo_invalidate(struct bo *bo, struct mapping *mapping)
+{
+       if (mapping->vma->priv) {
+               struct rockchip_private_map_data *priv = mapping->vma->priv;
+               memcpy(priv->cached_addr, priv->gem_addr, bo->meta.total_size);
+       }
+
+       return 0;
+}
+
+static int rockchip_bo_flush(struct bo *bo, struct mapping *mapping)
+{
+       struct rockchip_private_map_data *priv = mapping->vma->priv;
+       if (priv && (mapping->vma->map_flags & BO_MAP_WRITE))
+               memcpy(priv->gem_addr, priv->cached_addr, bo->meta.total_size);
+
+       return 0;
 }
 
-static uint32_t rockchip_resolve_format(uint32_t format, uint64_t usage)
+static uint32_t rockchip_resolve_format(struct driver *drv, uint32_t format, uint64_t use_flags)
 {
        switch (format) {
        case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
+               /* Camera subsystem requires NV12. */
+               if (use_flags & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE))
+                       return DRM_FORMAT_NV12;
                /*HACK: See b/28671744 */
                return DRM_FORMAT_XBGR8888;
        case DRM_FORMAT_FLEX_YCbCr_420_888:
@@ -293,7 +260,7 @@ static uint32_t rockchip_resolve_format(uint32_t format, uint64_t usage)
        }
 }
 
-struct backend backend_rockchip = {
+const struct backend backend_rockchip = {
        .name = "rockchip",
        .init = rockchip_init,
        .bo_create = rockchip_bo_create,
@@ -302,6 +269,8 @@ struct backend backend_rockchip = {
        .bo_import = drv_prime_bo_import,
        .bo_map = rockchip_bo_map,
        .bo_unmap = rockchip_bo_unmap,
+       .bo_invalidate = rockchip_bo_invalidate,
+       .bo_flush = rockchip_bo_flush,
        .resolve_format = rockchip_resolve_format,
 };