X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drv.c;h=87b633ab1bc3b1f3b30088fe1752033e683622a0;hb=4b5d0bf2ab4da0f475f01575fb369b7eb9415d7c;hp=026643e5404bd833dc96a9d6ade62dc9341b3b19;hpb=a40ca9e44611b763646795427100e183443dcf33;p=android-x86%2Fexternal-minigbm.git

diff --git a/drv.c b/drv.c
index 026643e..87b633a 100644
--- a/drv.c
+++ b/drv.c
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016 The Chromium OS Authors. All rights reserved.
+ * Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <stdint.h>
@@ -17,6 +18,9 @@
 #include "helpers.h"
 #include "util.h"
 
+#ifdef DRV_AMDGPU
+extern struct backend backend_amdgpu;
+#endif
 extern struct backend backend_cirrus;
 extern struct backend backend_evdi;
 #ifdef DRV_EXYNOS
@@ -32,6 +36,7 @@ extern struct backend backend_marvell;
 #ifdef DRV_MEDIATEK
 extern struct backend backend_mediatek;
 #endif
+extern struct backend backend_nouveau;
 #ifdef DRV_ROCKCHIP
 extern struct backend backend_rockchip;
 #endif
@@ -39,6 +44,10 @@ extern struct backend backend_rockchip;
 extern struct backend backend_tegra;
 #endif
 extern struct backend backend_udl;
+#ifdef DRV_VC4
+extern struct backend backend_vc4;
+#endif
+extern struct backend backend_vgem;
 extern struct backend backend_virtio_gpu;
 
 static struct backend *drv_get_backend(int fd)
@@ -52,8 +61,10 @@ static struct backend *drv_get_backend(int fd)
 		return NULL;
 
 	struct backend *backend_list[] = {
-		&backend_cirrus,
-		&backend_evdi,
+#ifdef DRV_AMDGPU
+		&backend_amdgpu,
+#endif
+		&backend_cirrus,   &backend_evdi,
 #ifdef DRV_EXYNOS
 		&backend_exynos,
 #endif
@@ -67,6 +78,7 @@ static struct backend *drv_get_backend(int fd)
 #ifdef DRV_MEDIATEK
 		&backend_mediatek,
 #endif
+		&backend_nouveau,
 #ifdef DRV_ROCKCHIP
 		&backend_rockchip,
 #endif
@@ -74,10 +86,13 @@ static struct backend *drv_get_backend(int fd)
 		&backend_tegra,
 #endif
 		&backend_udl,
-		&backend_virtio_gpu,
+#ifdef DRV_VC4
+		&backend_vc4,
+#endif
+		&backend_vgem,     &backend_virtio_gpu,
 	};
 
-	for(i = 0; i < ARRAY_SIZE(backend_list); i++)
+	for (i = 0; i < ARRAY_SIZE(backend_list); i++)
 		if (!strcmp(drm_version->name, backend_list[i]->name)) {
 			drmFreeVersion(drm_version);
 			return backend_list[i];
@@ -92,7 +107,7 @@ struct driver *drv_create(int fd)
 	struct driver *drv;
 	int ret;
 
-	drv = (struct driver *) calloc(1, sizeof(*drv));
+	drv = (struct driver *)calloc(1, sizeof(*drv));
 
 	if (!drv)
 		return NULL;
@@ -100,40 +115,63 @@ struct driver *drv_create(int fd)
 	drv->fd = fd;
 	drv->backend = drv_get_backend(fd);
 
-	if (!drv->backend) {
-		free(drv);
-		return NULL;
-	}
+	if (!drv->backend)
+		goto free_driver;
 
-	if (pthread_mutex_init(&drv->table_lock, NULL)) {
-		free(drv);
-		return NULL;
-	}
+	if (pthread_mutex_init(&drv->driver_lock, NULL))
+		goto free_driver;
 
 	drv->buffer_table = drmHashCreate();
-	if (!drv->buffer_table) {
-		free(drv);
-		return NULL;
-	}
+	if (!drv->buffer_table)
+		goto free_lock;
+
+	drv->map_table = drmHashCreate();
+	if (!drv->map_table)
+		goto free_buffer_table;
+
+	/* Start with a power of 2 number of allocations. */
+	drv->backend->combos.allocations = 2;
+	drv->backend->combos.size = 0;
+	drv->backend->combos.data =
+	    calloc(drv->backend->combos.allocations, sizeof(struct combination));
+	if (!drv->backend->combos.data)
+		goto free_map_table;
 
 	if (drv->backend->init) {
 		ret = drv->backend->init(drv);
 		if (ret) {
-			free(drv);
-			return NULL;
+			free(drv->backend->combos.data);
+			goto free_map_table;
 		}
 	}
 
 	return drv;
+
+free_map_table:
+	drmHashDestroy(drv->map_table);
+free_buffer_table:
+	drmHashDestroy(drv->buffer_table);
+free_lock:
+	pthread_mutex_destroy(&drv->driver_lock);
+free_driver:
+	free(drv);
+	return NULL;
 }
 
 void drv_destroy(struct driver *drv)
 {
+	pthread_mutex_lock(&drv->driver_lock);
+
 	if (drv->backend->close)
 		drv->backend->close(drv);
 
-	pthread_mutex_destroy(&drv->table_lock);
 	drmHashDestroy(drv->buffer_table);
+	drmHashDestroy(drv->map_table);
+
+	free(drv->backend->combos.data);
+
+	pthread_mutex_unlock(&drv->driver_lock);
+	pthread_mutex_destroy(&drv->driver_lock);
 
 	free(drv);
 }
@@ -143,39 +181,35 @@ int drv_get_fd(struct driver *drv)
 	return drv->fd;
 }
 
-const char *
-drv_get_name(struct driver *drv)
+const char *drv_get_name(struct driver *drv)
 {
 	return drv->backend->name;
 }
 
-int drv_is_format_supported(struct driver *drv, drv_format_t format,
-			    uint64_t usage)
+struct combination *drv_get_combination(struct driver *drv, uint32_t format, uint64_t usage)
 {
-	unsigned int i;
+	struct combination *curr, *best;
 
-	if (format == DRV_FORMAT_NONE || usage == DRV_BO_USE_NONE)
+	if (format == DRM_FORMAT_NONE || usage == BO_USE_NONE)
 		return 0;
 
-	for (i = 0 ; i < ARRAY_SIZE(drv->backend->format_list); i++)
-	{
-		if (!drv->backend->format_list[i].format)
-			break;
-
-		if (drv->backend->format_list[i].format == format &&
-		      (drv->backend->format_list[i].usage & usage) == usage)
-			return 1;
+	best = NULL;
+	uint32_t i;
+	for (i = 0; i < drv->backend->combos.size; i++) {
+		curr = &drv->backend->combos.data[i];
+		if ((format == curr->format) && usage == (curr->usage & usage))
+			if (!best || best->metadata.priority < curr->metadata.priority)
+				best = curr;
 	}
 
-	return 0;
+	return best;
 }
 
-struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height,
-		      drv_format_t format)
+struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height, uint32_t format)
 {
 
 	struct bo *bo;
-	bo = (struct bo *) calloc(1, sizeof(*bo));
+	bo = (struct bo *)calloc(1, sizeof(*bo));
 
 	if (!bo)
 		return NULL;
@@ -194,8 +228,8 @@ struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height,
 	return bo;
 }
 
-struct bo *drv_bo_create(struct driver *drv, uint32_t width, uint32_t height,
-			 drv_format_t format, uint64_t flags)
+struct bo *drv_bo_create(struct driver *drv, uint32_t width, uint32_t height, uint32_t format,
+			 uint64_t flags)
 {
 	int ret;
 	size_t plane;
@@ -213,62 +247,70 @@ struct bo *drv_bo_create(struct driver *drv, uint32_t width, uint32_t height,
 		return NULL;
 	}
 
-	pthread_mutex_lock(&drv->table_lock);
+	pthread_mutex_lock(&drv->driver_lock);
 
 	for (plane = 0; plane < bo->num_planes; plane++)
 		drv_increment_reference_count(drv, bo, plane);
 
-	pthread_mutex_unlock(&drv->table_lock);
+	pthread_mutex_unlock(&drv->driver_lock);
 
 	return bo;
 }
 
-void drv_bo_destroy(struct bo *bo)
+struct bo *drv_bo_create_with_modifiers(struct driver *drv, uint32_t width, uint32_t height,
+					uint32_t format, const uint64_t *modifiers, uint32_t count)
 {
+	int ret;
 	size_t plane;
-	uintptr_t total = 0;
-	struct driver *drv = bo->drv;
+	struct bo *bo;
 
-	pthread_mutex_lock(&drv->table_lock);
+	if (!drv->backend->bo_create_with_modifiers) {
+		errno = ENOENT;
+		return NULL;
+	}
 
-	for (plane = 0; plane < bo->num_planes; plane++)
-		drv_decrement_reference_count(drv, bo, plane);
+	bo = drv_bo_new(drv, width, height, format);
 
-	for (plane = 0; plane < bo->num_planes; plane++)
-		total += drv_get_reference_count(drv, bo, plane);
+	if (!bo)
+		return NULL;
 
-	pthread_mutex_unlock(&drv->table_lock);
+	ret = drv->backend->bo_create_with_modifiers(bo, width, height, format, modifiers, count);
 
-	if (total == 0)
-		bo->drv->backend->bo_destroy(bo);
+	if (ret) {
+		free(bo);
+		return NULL;
+	}
 
-	free(bo);
-}
+	pthread_mutex_lock(&drv->driver_lock);
 
-void *
-drv_bo_map(struct bo *bo)
-{
-	assert(drv_num_buffers_per_bo(bo) == 1);
+	for (plane = 0; plane < bo->num_planes; plane++)
+		drv_increment_reference_count(drv, bo, plane);
 
-	if (!bo->map_data || bo->map_data == MAP_FAILED)
-		bo->map_data = bo->drv->backend->bo_map(bo);
+	pthread_mutex_unlock(&drv->driver_lock);
 
-	return bo->map_data;
+	return bo;
 }
 
-int
-drv_bo_unmap(struct bo *bo)
+void drv_bo_destroy(struct bo *bo)
 {
-	int ret = -1;
+	size_t plane;
+	uintptr_t total = 0;
+	struct driver *drv = bo->drv;
 
-	assert(drv_num_buffers_per_bo(bo) == 1);
+	pthread_mutex_lock(&drv->driver_lock);
 
-	if (bo->map_data && bo->map_data != MAP_FAILED)
-		ret = munmap(bo->map_data, bo->total_size);
+	for (plane = 0; plane < bo->num_planes; plane++)
+		drv_decrement_reference_count(drv, bo, plane);
 
-	bo->map_data = NULL;
+	for (plane = 0; plane < bo->num_planes; plane++)
+		total += drv_get_reference_count(drv, bo, plane);
 
-	return ret;
+	pthread_mutex_unlock(&drv->driver_lock);
+
+	if (total == 0)
+		bo->drv->backend->bo_destroy(bo);
+
+	free(bo);
 }
 
 struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data)
@@ -276,46 +318,99 @@ struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data)
 	int ret;
 	size_t plane;
 	struct bo *bo;
-	struct drm_prime_handle prime_handle;
 
 	bo = drv_bo_new(drv, data->width, data->height, data->format);
 
 	if (!bo)
 		return NULL;
 
+	ret = drv->backend->bo_import(bo, data);
+	if (ret) {
+		free(bo);
+		return NULL;
+	}
+
 	for (plane = 0; plane < bo->num_planes; plane++) {
+		bo->strides[plane] = data->strides[plane];
+		bo->offsets[plane] = data->offsets[plane];
+		bo->sizes[plane] = data->sizes[plane];
+		bo->format_modifiers[plane] = data->format_modifiers[plane];
+		bo->total_size += data->sizes[plane];
+	}
 
-		memset(&prime_handle, 0, sizeof(prime_handle));
-		prime_handle.fd = data->fds[plane];
+	return bo;
+}
 
-		ret = drmIoctl(drv->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE,
-			       &prime_handle);
+void *drv_bo_map(struct bo *bo, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+		 uint32_t flags, struct map_info **map_data, size_t plane)
+{
+	void *ptr;
+	uint8_t *addr;
+	size_t offset;
+	struct map_info *data;
+	int prot;
+
+	assert(width > 0);
+	assert(height > 0);
+	assert(x + width <= drv_bo_get_width(bo));
+	assert(y + height <= drv_bo_get_height(bo));
+	assert(BO_TRANSFER_READ_WRITE & flags);
+
+	pthread_mutex_lock(&bo->drv->driver_lock);
+
+	if (!drmHashLookup(bo->drv->map_table, bo->handles[plane].u32, &ptr)) {
+		data = (struct map_info *)ptr;
+		data->refcount++;
+		goto success;
+	}
 
-		if (ret) {
-			fprintf(stderr, "drv: DRM_IOCTL_PRIME_FD_TO_HANDLE failed "
-				"(fd=%u)\n", prime_handle.fd);
+	data = calloc(1, sizeof(*data));
+	prot = BO_TRANSFER_WRITE & flags ? PROT_WRITE | PROT_READ : PROT_READ;
+	addr = bo->drv->backend->bo_map(bo, data, plane, prot);
+	if (addr == MAP_FAILED) {
+		*map_data = NULL;
+		free(data);
+		pthread_mutex_unlock(&bo->drv->driver_lock);
+		return MAP_FAILED;
+	}
 
-			if (plane > 0) {
-				bo->num_planes = plane;
-				drv_bo_destroy(bo);
-			} else {
-				free(bo);
-			}
+	data->refcount = 1;
+	data->addr = addr;
+	data->handle = bo->handles[plane].u32;
+	drmHashInsert(bo->drv->map_table, bo->handles[plane].u32, (void *)data);
 
-			return NULL;
-		}
+success:
+	*map_data = data;
+	offset = drv_bo_get_plane_stride(bo, plane) * y;
+	offset += drv_stride_from_format(bo->format, x, plane);
+	addr = (uint8_t *)data->addr;
+	addr += drv_bo_get_plane_offset(bo, plane) + offset;
+	pthread_mutex_unlock(&bo->drv->driver_lock);
 
-		bo->handles[plane].u32 = prime_handle.handle;
-		bo->strides[plane] = data->strides[plane];
-		bo->offsets[plane] = data->offsets[plane];
-		bo->sizes[plane] = data->sizes[plane];
+	return (void *)addr;
+}
 
-		pthread_mutex_lock(&drv->table_lock);
-		drv_increment_reference_count(drv, bo, plane);
-		pthread_mutex_unlock(&drv->table_lock);
+int drv_bo_unmap(struct bo *bo, struct map_info *data)
+{
+	int ret = 0;
+
+	assert(data);
+	assert(data->refcount >= 0);
+
+	pthread_mutex_lock(&bo->drv->driver_lock);
+
+	if (!--data->refcount) {
+		if (bo->drv->backend->bo_unmap)
+			ret = bo->drv->backend->bo_unmap(bo, data);
+		else
+			ret = munmap(data->addr, data->length);
+		drmHashDelete(bo->drv->map_table, data->handle);
+		free(data);
 	}
 
-	return bo;
+	pthread_mutex_unlock(&bo->drv->driver_lock);
+
+	return ret;
 }
 
 uint32_t drv_bo_get_width(struct bo *bo)
@@ -353,11 +448,9 @@ int drv_bo_get_plane_fd(struct bo *bo, size_t plane)
 	int ret, fd;
 	assert(plane < bo->num_planes);
 
-	ret = drmPrimeHandleToFD(bo->drv->fd, bo->handles[plane].u32,
-				 DRM_CLOEXEC | DRM_RDWR, &fd);
+	ret = drmPrimeHandleToFD(bo->drv->fd, bo->handles[plane].u32, DRM_CLOEXEC | DRM_RDWR, &fd);
 
 	return (ret) ? ret : fd;
-
 }
 
 uint32_t drv_bo_get_plane_offset(struct bo *bo, size_t plane)
@@ -380,14 +473,116 @@ uint32_t drv_bo_get_plane_stride(struct bo *bo, size_t plane)
 
 uint64_t drv_bo_get_plane_format_modifier(struct bo *bo, size_t plane)
 {
-        assert(plane < bo->num_planes);
+	assert(plane < bo->num_planes);
 	return bo->format_modifiers[plane];
 }
 
-drv_format_t drv_resolve_format(struct driver *drv, drv_format_t format)
+uint32_t drv_bo_get_format(struct bo *bo)
+{
+	return bo->format;
+}
+
+uint32_t drv_resolve_format(struct driver *drv, uint32_t format, uint64_t usage)
 {
 	if (drv->backend->resolve_format)
-		return drv->backend->resolve_format(format);
+		return drv->backend->resolve_format(format, usage);
 
 	return format;
 }
+
+size_t drv_num_planes_from_format(uint32_t format)
+{
+	switch (format) {
+	case DRM_FORMAT_ABGR1555:
+	case DRM_FORMAT_ABGR2101010:
+	case DRM_FORMAT_ABGR4444:
+	case DRM_FORMAT_ABGR8888:
+	case DRM_FORMAT_ARGB1555:
+	case DRM_FORMAT_ARGB2101010:
+	case DRM_FORMAT_ARGB4444:
+	case DRM_FORMAT_ARGB8888:
+	case DRM_FORMAT_AYUV:
+	case DRM_FORMAT_BGR233:
+	case DRM_FORMAT_BGR565:
+	case DRM_FORMAT_BGR888:
+	case DRM_FORMAT_BGRA1010102:
+	case DRM_FORMAT_BGRA4444:
+	case DRM_FORMAT_BGRA5551:
+	case DRM_FORMAT_BGRA8888:
+	case DRM_FORMAT_BGRX1010102:
+	case DRM_FORMAT_BGRX4444:
+	case DRM_FORMAT_BGRX5551:
+	case DRM_FORMAT_BGRX8888:
+	case DRM_FORMAT_C8:
+	case DRM_FORMAT_GR88:
+	case DRM_FORMAT_R8:
+	case DRM_FORMAT_RG88:
+	case DRM_FORMAT_RGB332:
+	case DRM_FORMAT_RGB565:
+	case DRM_FORMAT_RGB888:
+	case DRM_FORMAT_RGBA1010102:
+	case DRM_FORMAT_RGBA4444:
+	case DRM_FORMAT_RGBA5551:
+	case DRM_FORMAT_RGBA8888:
+	case DRM_FORMAT_RGBX1010102:
+	case DRM_FORMAT_RGBX4444:
+	case DRM_FORMAT_RGBX5551:
+	case DRM_FORMAT_RGBX8888:
+	case DRM_FORMAT_UYVY:
+	case DRM_FORMAT_VYUY:
+	case DRM_FORMAT_XBGR1555:
+	case DRM_FORMAT_XBGR2101010:
+	case DRM_FORMAT_XBGR4444:
+	case DRM_FORMAT_XBGR8888:
+	case DRM_FORMAT_XRGB1555:
+	case DRM_FORMAT_XRGB2101010:
+	case DRM_FORMAT_XRGB4444:
+	case DRM_FORMAT_XRGB8888:
+	case DRM_FORMAT_YUYV:
+	case DRM_FORMAT_YVYU:
+		return 1;
+	case DRM_FORMAT_NV12:
+	case DRM_FORMAT_NV21:
+		return 2;
+	case DRM_FORMAT_YVU420:
+	case DRM_FORMAT_YVU420_ANDROID:
+		return 3;
+	}
+
+	fprintf(stderr, "drv: UNKNOWN FORMAT %d\n", format);
+	return 0;
+}
+
+uint32_t drv_size_from_format(uint32_t format, uint32_t stride, uint32_t height, size_t plane)
+{
+	assert(plane < drv_num_planes_from_format(format));
+	uint32_t vertical_subsampling;
+
+	switch (format) {
+	case DRM_FORMAT_NV12:
+	case DRM_FORMAT_YVU420:
+	case DRM_FORMAT_YVU420_ANDROID:
+		vertical_subsampling = (plane == 0) ? 1 : 2;
+		break;
+	default:
+		vertical_subsampling = 1;
+	}
+
+	return stride * DIV_ROUND_UP(height, vertical_subsampling);
+}
+
+uint32_t drv_num_buffers_per_bo(struct bo *bo)
+{
+	uint32_t count = 0;
+	size_t plane, p;
+
+	for (plane = 0; plane < bo->num_planes; plane++) {
+		for (p = 0; p < plane; p++)
+			if (bo->handles[p].u32 == bo->handles[plane].u32)
+				break;
+		if (p == plane)
+			count++;
+	}
+
+	return count;
+}