[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709...

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

diff --git a/drv.c b/drv.c
index ef5cbc5..636cd07 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -54,6 +54,9 @@ extern const struct backend backend_radeon;
 #ifdef DRV_ROCKCHIP
 extern const struct backend backend_rockchip;
 #endif
+#ifdef DRV_SYNAPTICS
+extern const struct backend backend_synaptics;
+#endif
 #ifdef DRV_TEGRA
 extern const struct backend backend_tegra;
 #endif
@@ -104,6 +107,9 @@ static const struct backend *drv_get_backend(int fd)
 #ifdef DRV_ROCKCHIP
                &backend_rockchip,
 #endif
+#ifdef DRV_SYNAPTICS
+               &backend_synaptics,
+#endif
 #ifdef DRV_TEGRA
                &backend_tegra,
 #endif
@@ -111,14 +117,24 @@ static const struct backend *drv_get_backend(int fd)
 #ifdef DRV_VC4
                &backend_vc4,
 #endif
-               &backend_vgem,     &backend_virtio_gpu,
+               &backend_vgem,      &backend_virtio_gpu,
        };
 
-       for (i = 0; i < ARRAY_SIZE(backend_list); i++)
-               if (!strcmp(drm_version->name, backend_list[i]->name)) {
+       for (i = 0; i < ARRAY_SIZE(backend_list); i++) {
+               const struct backend *b = backend_list[i];
+               // Exactly one of the main create functions must be defined.
+               assert((b->bo_create != NULL) ^ (b->bo_create_from_metadata != NULL));
+               // Either both or neither must be implemented.
+               assert((b->bo_compute_metadata != NULL) == (b->bo_create_from_metadata != NULL));
+               // Both can't be defined, but it's okay for neither to be (i.e. only bo_create).
+               assert((b->bo_create_with_modifiers == NULL) ||
+                      (b->bo_create_from_metadata == NULL));
+
+               if (!strcmp(drm_version->name, b->name)) {
                        drmFreeVersion(drm_version);
-                       return backend_list[i];
+                       return b;
                }
+       }
 
        drmFreeVersion(drm_version);
        return NULL;
@@ -223,7 +239,7 @@ struct combination *drv_get_combination(struct driver *drv, uint32_t format, uin
 }
 
 struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height, uint32_t format,
-                     uint64_t use_flags)
+                     uint64_t use_flags, bool is_test_buffer)
 {
 
        struct bo *bo;
@@ -238,6 +254,7 @@ struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height, uint3
        bo->meta.format = format;
        bo->meta.use_flags = use_flags;
        bo->meta.num_planes = drv_num_planes_from_format(format);
+       bo->is_test_buffer = is_test_buffer;
 
        if (!bo->meta.num_planes) {
                free(bo);
@@ -253,13 +270,25 @@ struct bo *drv_bo_create(struct driver *drv, uint32_t width, uint32_t height, ui
        int ret;
        size_t plane;
        struct bo *bo;
+       bool is_test_alloc;
 
-       bo = drv_bo_new(drv, width, height, format, use_flags);
+       is_test_alloc = use_flags & BO_USE_TEST_ALLOC;
+       use_flags &= ~BO_USE_TEST_ALLOC;
+
+       bo = drv_bo_new(drv, width, height, format, use_flags, is_test_alloc);
 
        if (!bo)
                return NULL;
 
-       ret = drv->backend->bo_create(bo, width, height, format, use_flags);
+       ret = -EINVAL;
+       if (drv->backend->bo_compute_metadata) {
+               ret = drv->backend->bo_compute_metadata(bo, width, height, format, use_flags, NULL,
+                                                       0);
+               if (!is_test_alloc && ret == 0)
+                       ret = drv->backend->bo_create_from_metadata(bo);
+       } else if (!is_test_alloc) {
+               ret = drv->backend->bo_create(bo, width, height, format, use_flags);
+       }
 
        if (ret) {
                free(bo);
@@ -287,17 +316,26 @@ struct bo *drv_bo_create_with_modifiers(struct driver *drv, uint32_t width, uint
        size_t plane;
        struct bo *bo;
 
-       if (!drv->backend->bo_create_with_modifiers) {
+       if (!drv->backend->bo_create_with_modifiers && !drv->backend->bo_compute_metadata) {
                errno = ENOENT;
                return NULL;
        }
 
-       bo = drv_bo_new(drv, width, height, format, BO_USE_NONE);
+       bo = drv_bo_new(drv, width, height, format, BO_USE_NONE, false);
 
        if (!bo)
                return NULL;
 
-       ret = drv->backend->bo_create_with_modifiers(bo, width, height, format, modifiers, count);
+       ret = -EINVAL;
+       if (drv->backend->bo_compute_metadata) {
+               ret = drv->backend->bo_compute_metadata(bo, width, height, format, BO_USE_NONE,
+                                                       modifiers, count);
+               if (ret == 0)
+                       ret = drv->backend->bo_create_from_metadata(bo);
+       } else {
+               ret = drv->backend->bo_create_with_modifiers(bo, width, height, format, modifiers,
+                                                            count);
+       }
 
        if (ret) {
                free(bo);
@@ -320,23 +358,27 @@ struct bo *drv_bo_create_with_modifiers(struct driver *drv, uint32_t width, uint
 
 void drv_bo_destroy(struct bo *bo)
 {
+       int ret;
        size_t plane;
        uintptr_t total = 0;
        struct driver *drv = bo->drv;
 
-       pthread_mutex_lock(&drv->driver_lock);
+       if (!bo->is_test_buffer) {
+               pthread_mutex_lock(&drv->driver_lock);
 
-       for (plane = 0; plane < bo->meta.num_planes; plane++)
-               drv_decrement_reference_count(drv, bo, plane);
+               for (plane = 0; plane < bo->meta.num_planes; plane++)
+                       drv_decrement_reference_count(drv, bo, plane);
 
-       for (plane = 0; plane < bo->meta.num_planes; plane++)
-               total += drv_get_reference_count(drv, bo, plane);
+               for (plane = 0; plane < bo->meta.num_planes; plane++)
+                       total += drv_get_reference_count(drv, bo, plane);
 
-       pthread_mutex_unlock(&drv->driver_lock);
+               pthread_mutex_unlock(&drv->driver_lock);
 
-       if (total == 0) {
-               assert(drv_mapping_destroy(bo) == 0);
-               bo->drv->backend->bo_destroy(bo);
+               if (total == 0) {
+                       ret = drv_mapping_destroy(bo);
+                       assert(ret == 0);
+                       bo->drv->backend->bo_destroy(bo);
+               }
        }
 
        free(bo);
@@ -349,7 +391,7 @@ struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data)
        struct bo *bo;
        off_t seek_end;
 
-       bo = drv_bo_new(drv, data->width, data->height, data->format, data->use_flags);
+       bo = drv_bo_new(drv, data->width, data->height, data->format, data->use_flags, false);
 
        if (!bo)
                return NULL;
@@ -413,6 +455,10 @@ void *drv_bo_map(struct bo *bo, const struct rectangle *rect, uint32_t map_flags
        /* No CPU access for protected buffers. */
        assert(!(bo->meta.use_flags & BO_USE_PROTECTED));
 
+       if (bo->is_test_buffer) {
+               return MAP_FAILED;
+       }
+
        memset(&mapping, 0, sizeof(mapping));
        mapping.rect = *rect;
        mapping.refcount = 1;
@@ -512,6 +558,21 @@ int drv_bo_invalidate(struct bo *bo, struct mapping *mapping)
        return ret;
 }
 
+int drv_bo_flush(struct bo *bo, struct mapping *mapping)
+{
+       int ret = 0;
+
+       assert(mapping);
+       assert(mapping->vma);
+       assert(mapping->refcount > 0);
+       assert(mapping->vma->refcount > 0);
+
+       if (bo->drv->backend->bo_flush)
+               ret = bo->drv->backend->bo_flush(bo, mapping);
+
+       return ret;
+}
+
 int drv_bo_flush_or_unmap(struct bo *bo, struct mapping *mapping)
 {
        int ret = 0;
@@ -540,11 +601,6 @@ uint32_t drv_bo_get_height(struct bo *bo)
        return bo->meta.height;
 }
 
-uint32_t drv_bo_get_stride_or_tiling(struct bo *bo)
-{
-       return bo->meta.tiling ? bo->meta.tiling : drv_bo_get_plane_stride(bo, 0);
-}
-
 size_t drv_bo_get_num_planes(struct bo *bo)
 {
        return bo->meta.num_planes;
@@ -565,6 +621,10 @@ int drv_bo_get_plane_fd(struct bo *bo, size_t plane)
        int ret, fd;
        assert(plane < bo->meta.num_planes);
 
+       if (bo->is_test_buffer) {
+               return -EINVAL;
+       }
+
        ret = drmPrimeHandleToFD(bo->drv->fd, bo->handles[plane].u32, DRM_CLOEXEC | DRM_RDWR, &fd);
 
        // Older DRM implementations blocked DRM_RDWR, but gave a read/write mapping anyways
@@ -603,6 +663,11 @@ uint32_t drv_bo_get_format(struct bo *bo)
        return bo->meta.format;
 }
 
+size_t drv_bo_get_total_size(struct bo *bo)
+{
+       return bo->meta.total_size;
+}
+
 uint32_t drv_resolve_format(struct driver *drv, uint32_t format, uint64_t use_flags)
 {
        if (drv->backend->resolve_format)
@@ -616,6 +681,10 @@ uint32_t drv_num_buffers_per_bo(struct bo *bo)
        uint32_t count = 0;
        size_t plane, p;
 
+       if (bo->is_test_buffer) {
+               return 0;
+       }
+
        for (plane = 0; plane < bo->meta.num_planes; plane++) {
                for (p = 0; p < plane; p++)
                        if (bo->handles[p].u32 == bo->handles[plane].u32)
@@ -642,3 +711,17 @@ void drv_log_prefix(const char *prefix, const char *file, int line, const char *
 #endif
        va_end(args);
 }
+
+int drv_resource_info(struct bo *bo, uint32_t strides[DRV_MAX_PLANES],
+                     uint32_t offsets[DRV_MAX_PLANES])
+{
+       for (uint32_t plane = 0; plane < bo->meta.num_planes; plane++) {
+               strides[plane] = bo->meta.strides[plane];
+               offsets[plane] = bo->meta.offsets[plane];
+       }
+
+       if (bo->drv->backend->resource_info)
+               return bo->drv->backend->resource_info(bo, strides, offsets);
+
+       return 0;
+}