X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=mediatek.c;h=3d2702fb5c7b7309d530a8cf5e438b4f1e74bf9f;hb=4b5d0bf2ab4da0f475f01575fb369b7eb9415d7c;hp=6d8d94d01303a406b829237d69c25816d5de2346;hpb=46faf6bf430b8f8805f2acfad546329eebcd50f6;p=android-x86%2Fexternal-minigbm.git

diff --git a/mediatek.c b/mediatek.c
index 6d8d94d..3d2702f 100644
--- a/mediatek.c
+++ b/mediatek.c
@@ -6,53 +6,113 @@
 
 #ifdef DRV_MEDIATEK
 
+// clang-format off
 #include <stdio.h>
 #include <string.h>
+#include <sys/mman.h>
 #include <xf86drm.h>
 #include <mediatek_drm.h>
-#include <stdio.h>
+// clang-format on
+
 #include "drv_priv.h"
 #include "helpers.h"
+#include "util.h"
+
+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 drv_mediatek_bo_create(struct bo *bo,
-				  uint32_t width, uint32_t height,
-				  uint32_t format, uint32_t flags)
+static int mediatek_init(struct driver *drv)
+{
+	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)
 {
-	size_t size;
-	struct drm_mtk_gem_create gem_create;
 	int ret;
+	size_t plane;
+	uint32_t stride;
+	struct drm_mtk_gem_create gem_create;
 
-	bo->strides[0] = drv_stride_from_format(format, width);
-	size = height * bo->strides[0];
+	/*
+	 * Since the ARM L1 cache line size is 64 bytes, align to that as a
+	 * performance optimization.
+	 */
+	stride = drv_stride_from_format(format, width, 0);
+	stride = ALIGN(stride, 64);
+	drv_bo_from_format(bo, stride, height, format);
 
 	memset(&gem_create, 0, sizeof(gem_create));
-	gem_create.size = size;
+	gem_create.size = bo->total_size;
 
 	ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MTK_GEM_CREATE, &gem_create);
 	if (ret) {
-		fprintf(stderr, "drv: DRM_IOCTL_MTK_GEM_CREATE failed "
-				"(size=%zu)\n", size);
+		fprintf(stderr, "drv: DRM_IOCTL_MTK_GEM_CREATE failed (size=%llu)\n",
+			gem_create.size);
 		return ret;
 	}
 
-	bo->handles[0].u32 = gem_create.handle;
-	bo->sizes[0] = size;
-	bo->offsets[0] = 0;
+	for (plane = 0; plane < bo->num_planes; plane++)
+		bo->handles[plane].u32 = gem_create.handle;
 
 	return 0;
 }
 
-const struct backend backend_mediatek =
+static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane, int prot)
 {
+	int ret;
+	struct drm_mtk_gem_map_off gem_map;
+
+	memset(&gem_map, 0, sizeof(gem_map));
+	gem_map.handle = bo->handles[0].u32;
+
+	ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MTK_GEM_MAP_OFFSET, &gem_map);
+	if (ret) {
+		fprintf(stderr, "drv: DRM_IOCTL_MTK_GEM_MAP_OFFSET failed\n");
+		return MAP_FAILED;
+	}
+
+	data->length = bo->total_size;
+
+	return mmap(0, bo->total_size, prot, MAP_SHARED, bo->drv->fd, gem_map.offset);
+}
+
+static uint32_t mediatek_resolve_format(uint32_t format, uint64_t usage)
+{
+	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;
+	default:
+		return format;
+	}
+}
+
+struct backend backend_mediatek = {
 	.name = "mediatek",
-	.bo_create = drv_mediatek_bo_create,
+	.init = mediatek_init,
+	.bo_create = mediatek_bo_create,
 	.bo_destroy = drv_gem_bo_destroy,
-	.format_list = {
-		{DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
-		{DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-		{DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
-		{DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-	}
+	.bo_import = drv_prime_bo_import,
+	.bo_map = mediatek_bo_map,
+	.resolve_format = mediatek_resolve_format,
 };
 
 #endif