X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=mediatek.c;h=1a1061ca68eaa47b36706e1bbb02bfb3a96741ca;hb=d9354b69f2bb88e4117872c1a17bb7f1db8f7e37;hp=db3c9fab933e108df936f1368c8f09bddf46991c;hpb=085bff124f5a65050c00933d4c98a531736b1bcc;p=android-x86%2Fexternal-minigbm.git

diff --git a/mediatek.c b/mediatek.c
index db3c9fa..1a1061c 100644
--- a/mediatek.c
+++ b/mediatek.c
@@ -18,18 +18,36 @@
 #include "helpers.h"
 #include "util.h"
 
-static const uint32_t supported_formats[] = { DRM_FORMAT_ABGR8888,      DRM_FORMAT_ARGB8888,
-					      DRM_FORMAT_RGB565,	DRM_FORMAT_XBGR8888,
-					      DRM_FORMAT_XRGB8888,      DRM_FORMAT_YVU420,
-					      DRM_FORMAT_YVU420_ANDROID };
+struct mediatek_private_map_data {
+	void *cached_addr;
+	void *gem_addr;
+};
+
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
+						  DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
+						  DRM_FORMAT_XRGB8888 };
+
+static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_YVU420,
+						   DRM_FORMAT_YVU420_ANDROID };
 
 static int mediatek_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;
+
+	ret = drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
+				   &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
+	if (ret)
+		return ret;
+
+	return drv_modify_linear_combinations(drv);
 }
 
 static int mediatek_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;
@@ -60,10 +78,11 @@ static int mediatek_bo_create(struct bo *bo, uint32_t width, uint32_t height, ui
 	return 0;
 }
 
-static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane)
+static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane, uint32_t map_flags)
 {
 	int ret;
 	struct drm_mtk_gem_map_off gem_map;
+	struct mediatek_private_map_data *priv;
 
 	memset(&gem_map, 0, sizeof(gem_map));
 	gem_map.handle = bo->handles[0].u32;
@@ -74,20 +93,53 @@ static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane)
 		return MAP_FAILED;
 	}
 
+	void *addr = mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
+			  gem_map.offset);
+
 	data->length = bo->total_size;
 
-	return mmap(0, bo->total_size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->drv->fd,
-		    gem_map.offset);
+	if (bo->use_flags & BO_USE_RENDERSCRIPT) {
+		priv = calloc(1, sizeof(*priv));
+		priv->cached_addr = calloc(1, bo->total_size);
+		priv->gem_addr = addr;
+		memcpy(priv->cached_addr, priv->gem_addr, bo->total_size);
+		data->priv = priv;
+		addr = priv->cached_addr;
+	}
+
+	return addr;
+}
+
+static int mediatek_bo_unmap(struct bo *bo, struct map_info *data)
+{
+	if (data->priv) {
+		struct mediatek_private_map_data *priv = data->priv;
+		data->addr = priv->gem_addr;
+		free(priv->cached_addr);
+		free(priv);
+		data->priv = NULL;
+	}
+
+	return munmap(data->addr, data->length);
+}
+
+static int mediatek_bo_flush(struct bo *bo, struct map_info *data)
+{
+	struct mediatek_private_map_data *priv = data->priv;
+	if (priv && (data->map_flags & BO_MAP_WRITE))
+		memcpy(priv->gem_addr, priv->cached_addr, bo->total_size);
+
+	return 0;
 }
 
-static uint32_t mediatek_resolve_format(uint32_t format)
+static uint32_t mediatek_resolve_format(uint32_t format, uint64_t use_flags)
 {
 	switch (format) {
 	case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
 		/*HACK: See b/28671744 */
 		return DRM_FORMAT_XBGR8888;
 	case DRM_FORMAT_FLEX_YCbCr_420_888:
-		return DRM_FORMAT_YVU420_ANDROID;
+		return DRM_FORMAT_YVU420;
 	default:
 		return format;
 	}
@@ -100,6 +152,8 @@ struct backend backend_mediatek = {
 	.bo_destroy = drv_gem_bo_destroy,
 	.bo_import = drv_prime_bo_import,
 	.bo_map = mediatek_bo_map,
+	.bo_unmap = mediatek_bo_unmap,
+	.bo_flush = mediatek_bo_flush,
 	.resolve_format = mediatek_resolve_format,
 };