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

diff --git a/drv.c b/drv.c
index 64b7f71..87b633a 100644
--- a/drv.c
+++ b/drv.c
@@ -64,8 +64,7 @@ static struct backend *drv_get_backend(int fd)
 #ifdef DRV_AMDGPU
 		&backend_amdgpu,
 #endif
-		&backend_cirrus,
-		&backend_evdi,
+		&backend_cirrus,   &backend_evdi,
 #ifdef DRV_EXYNOS
 		&backend_exynos,
 #endif
@@ -90,11 +89,10 @@ static 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++)
+	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];
@@ -109,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;
@@ -134,8 +132,8 @@ struct driver *drv_create(int fd)
 	/* 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));
+	drv->backend->combos.data =
+	    calloc(drv->backend->combos.allocations, sizeof(struct combination));
 	if (!drv->backend->combos.data)
 		goto free_map_table;
 
@@ -183,14 +181,12 @@ 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;
 }
 
-struct combination *drv_get_combination(struct driver *drv, uint32_t format,
-					uint64_t usage)
+struct combination *drv_get_combination(struct driver *drv, uint32_t format, uint64_t usage)
 {
 	struct combination *curr, *best;
 
@@ -202,20 +198,18 @@ struct combination *drv_get_combination(struct driver *drv, uint32_t format,
 	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)
+			if (!best || best->metadata.priority < curr->metadata.priority)
 				best = curr;
 	}
 
 	return best;
 }
 
-struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height,
-		      uint32_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;
@@ -234,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,
-			 uint32_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;
@@ -263,10 +257,8 @@ struct bo *drv_bo_create(struct driver *drv, uint32_t width, uint32_t height,
 	return 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)
+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;
@@ -282,8 +274,7 @@ struct bo *drv_bo_create_with_modifiers(struct driver *drv,
 	if (!bo)
 		return NULL;
 
-	ret = drv->backend->bo_create_with_modifiers(bo, width, height,
-						     format, modifiers, count);
+	ret = drv->backend->bo_create_with_modifiers(bo, width, height, format, modifiers, count);
 
 	if (ret) {
 		free(bo);
@@ -300,7 +291,6 @@ struct bo *drv_bo_create_with_modifiers(struct driver *drv,
 	return bo;
 }
 
-
 void drv_bo_destroy(struct bo *bo)
 {
 	size_t plane;
@@ -351,30 +341,32 @@ struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data)
 	return bo;
 }
 
-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 *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 = (struct map_info *)ptr;
 		data->refcount++;
 		goto success;
 	}
 
 	data = calloc(1, sizeof(*data));
-	addr = bo->drv->backend->bo_map(bo, data, plane);
+	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);
@@ -385,18 +377,17 @@ void *drv_bo_map(struct bo *bo, uint32_t x, uint32_t y, uint32_t width,
 	data->refcount = 1;
 	data->addr = addr;
 	data->handle = bo->handles[plane].u32;
-	drmHashInsert(bo->drv->map_table, bo->handles[plane].u32,
-		      (void *) data);
+	drmHashInsert(bo->drv->map_table, bo->handles[plane].u32, (void *)data);
 
 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 = (uint8_t *)data->addr;
 	addr += drv_bo_get_plane_offset(bo, plane) + offset;
 	pthread_mutex_unlock(&bo->drv->driver_lock);
 
-	return (void *) addr;
+	return (void *)addr;
 }
 
 int drv_bo_unmap(struct bo *bo, struct map_info *data)
@@ -457,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)
@@ -484,7 +473,7 @@ 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];
 }
 
@@ -493,39 +482,14 @@ uint32_t drv_bo_get_format(struct bo *bo)
 	return bo->format;
 }
 
-uint32_t drv_resolve_format(struct driver *drv, uint32_t 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;
 }
 
-/*
- * This function returns the stride for a given format, width and plane.
- */
-int drv_stride_from_format(uint32_t format, uint32_t width, size_t plane)
-{
-	int stride = width * DIV_ROUND_UP(drv_bpp_from_format(format, plane),
-					  8);
-
-	/*
-	 * Only downsample for certain multiplanar formats which have horizontal
-	 * subsampling for chroma planes.  Only formats supported by our drivers
-	 * are listed here -- add more as needed.
-	 */
-	if (plane != 0) {
-		switch (format) {
-		case DRM_FORMAT_NV12:
-		case DRM_FORMAT_YVU420:
-			stride = stride / 2;
-			break;
-		}
-	}
-
-	return stride;
-}
-
 size_t drv_num_planes_from_format(uint32_t format)
 {
 	switch (format) {
@@ -578,8 +542,10 @@ size_t drv_num_planes_from_format(uint32_t format)
 	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;
 	}
 
@@ -587,8 +553,7 @@ size_t drv_num_planes_from_format(uint32_t format)
 	return 0;
 }
 
-uint32_t drv_size_from_format(uint32_t format, uint32_t stride,
-			      uint32_t height, size_t plane)
+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;
@@ -596,6 +561,7 @@ uint32_t drv_size_from_format(uint32_t format, uint32_t stride,
 	switch (format) {
 	case DRM_FORMAT_NV12:
 	case DRM_FORMAT_YVU420:
+	case DRM_FORMAT_YVU420_ANDROID:
 		vertical_subsampling = (plane == 0) ? 1 : 2;
 		break;
 	default: