X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vc4.c;h=71e73ea5ba0e9f24b520a11e3c470f4e9aa11fda;hb=1c4a1cf7e48264011549b6da1b1588a8ff076a11;hp=9103b8ae99d803caf4bd0cbceaab68cf3bd7c3d2;hpb=1b1d56ae4018eaed1da9d6e7032554156b7be020;p=android-x86%2Fexternal-minigbm.git

diff --git a/vc4.c b/vc4.c
index 9103b8a..71e73ea 100644
--- a/vc4.c
+++ b/vc4.c
@@ -16,16 +16,19 @@
 #include "helpers.h"
 #include "util.h"
 
-static const uint32_t supported_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
-					      DRM_FORMAT_XRGB8888 };
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
+						  DRM_FORMAT_XRGB8888 };
 
 static int vc4_init(struct driver *drv)
 {
-	return drv_add_linear_combinations(drv, supported_formats, ARRAY_SIZE(supported_formats));
+	drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+			     &LINEAR_METADATA, BO_USE_RENDER_MASK);
+
+	return drv_modify_linear_combinations(drv);
 }
 
 static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-			 uint32_t flags)
+			 uint64_t use_flags)
 {
 	int ret;
 	size_t plane;
@@ -45,9 +48,7 @@ static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_
 
 	ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VC4_CREATE_BO, &bo_create);
 	if (ret) {
-		fprintf(stderr, "drv: DRM_IOCTL_VC4_GEM_CREATE failed "
-				"(size=%zu)\n",
-			bo->total_size);
+		drv_log("DRM_IOCTL_VC4_GEM_CREATE failed (size=%zu)\n", bo->total_size);
 		return ret;
 	}
 
@@ -57,7 +58,7 @@ static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_
 	return 0;
 }
 
-static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane)
+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;
@@ -67,23 +68,23 @@ static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane)
 
 	ret = drmCommandWriteRead(bo->drv->fd, DRM_VC4_MMAP_BO, &bo_map, sizeof(bo_map));
 	if (ret) {
-		fprintf(stderr, "drv: DRM_VC4_MMAP_BO failed\n");
+		drv_log("DRM_VC4_MMAP_BO failed\n");
 		return MAP_FAILED;
 	}
 
-	data->length = bo->total_size;
-
-	return mmap(0, bo->total_size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->drv->fd,
+	vma->length = bo->total_size;
+	return mmap(NULL, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
 		    bo_map.offset);
 }
 
-struct backend backend_vc4 = {
+const struct backend backend_vc4 = {
 	.name = "vc4",
 	.init = vc4_init,
 	.bo_create = vc4_bo_create,
 	.bo_import = drv_prime_bo_import,
 	.bo_destroy = drv_gem_bo_destroy,
 	.bo_map = vc4_bo_map,
+	.bo_unmap = drv_bo_munmap,
 };
 
 #endif