X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vc4.c;h=c797bd9529c6158fe1ee624ac8f4c348c334ba5d;hb=4b5d0bf2ab4da0f475f01575fb369b7eb9415d7c;hp=a120f3dd849cf7f0b5707fa9449b7a2aebe9ab91;hpb=085bff124f5a65050c00933d4c98a531736b1bcc;p=android-x86%2Fexternal-minigbm.git

diff --git a/vc4.c b/vc4.c
index a120f3d..c797bd9 100644
--- a/vc4.c
+++ b/vc4.c
@@ -16,12 +16,18 @@
 #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));
+	int ret;
+	ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+				   &LINEAR_METADATA, BO_USE_RENDER_MASK);
+	if (ret)
+		return ret;
+
+	return drv_modify_linear_combinations(drv);
 }
 
 static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
@@ -56,7 +62,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 map_info *data, size_t plane, int prot)
 {
 	int ret;
 	struct drm_vc4_mmap_bo bo_map;
@@ -71,9 +77,7 @@ static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane)
 	}
 
 	data->length = bo->total_size;
-
-	return mmap(0, bo->total_size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->drv->fd,
-		    bo_map.offset);
+	return mmap(0, bo->total_size, prot, MAP_SHARED, bo->drv->fd, bo_map.offset);
 }
 
 struct backend backend_vc4 = {