X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=exynos.c;h=963f0307b27aa24af3dc1d4d3c2e39df85b74df4;hb=0f238ac9eb2fad20f543c2cceeca72e5fc64ef54;hp=bde6c1104da071eb68fea4a5df928dc8f50b656f;hpb=96c7a3bf4c04a52d04f2b2cb8070d662ca337a7d;p=android-x86%2Fexternal-minigbm.git

diff --git a/exynos.c b/exynos.c
index bde6c11..963f030 100644
--- a/exynos.c
+++ b/exynos.c
@@ -1,28 +1,50 @@
 /*
- * Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+ * Copyright 2014 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#ifdef GBM_EXYNOS
+#ifdef DRV_EXYNOS
 
+// clang-format off
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <xf86drm.h>
 #include <exynos_drm.h>
+// clang-format on
 
-#include "gbm_priv.h"
+#include "drv_priv.h"
 #include "helpers.h"
 #include "util.h"
 
-int gbm_exynos_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height,
-			 uint32_t format, uint32_t flags)
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
+
+static const uint32_t texture_source_formats[] = { DRM_FORMAT_NV12 };
+
+static int exynos_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 exynos_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+			    uint64_t use_flags)
 {
 	size_t plane;
 
-	if (format == GBM_FORMAT_NV12) {
+	if (format == DRM_FORMAT_NV12) {
 		uint32_t chroma_height;
 		/* V4L2 s5p-mfc requires width to be 16 byte aligned and height 32. */
 		width = ALIGN(width, 16);
@@ -33,49 +55,64 @@ int gbm_exynos_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height,
 		bo->sizes[0] = bo->strides[0] * height + 64;
 		bo->sizes[1] = bo->strides[1] * chroma_height + 64;
 		bo->offsets[0] = bo->offsets[1] = 0;
-	} else if (format == GBM_FORMAT_XRGB8888 || format == GBM_FORMAT_ARGB8888 ||
-			format == GBM_BO_FORMAT_XRGB8888 || format == GBM_BO_FORMAT_ARGB8888 ) {
-		bo->strides[0] = gbm_stride_from_format(format, width);
-		bo->sizes[0] = height * bo->strides[0];
+		bo->total_size = bo->sizes[0] + bo->sizes[1];
+	} else if (format == DRM_FORMAT_XRGB8888 || format == DRM_FORMAT_ARGB8888) {
+		bo->strides[0] = drv_stride_from_format(format, width, 0);
+		bo->total_size = bo->sizes[0] = height * bo->strides[0];
 		bo->offsets[0] = 0;
 	} else {
-		fprintf(stderr, "minigbm: unsupported format %X\n", format);
+		fprintf(stderr, "drv: unsupported format %X\n", format);
 		assert(0);
 		return -EINVAL;
 	}
 
+	int ret;
 	for (plane = 0; plane < bo->num_planes; plane++) {
 		size_t size = bo->sizes[plane];
 		struct drm_exynos_gem_create gem_create;
-		int ret;
 
 		memset(&gem_create, 0, sizeof(gem_create));
 		gem_create.size = size;
 		gem_create.flags = EXYNOS_BO_NONCONTIG;
 
-		ret = drmIoctl(bo->gbm->fd, DRM_IOCTL_EXYNOS_GEM_CREATE, &gem_create);
+		ret = drmIoctl(bo->drv->fd, DRM_IOCTL_EXYNOS_GEM_CREATE, &gem_create);
 		if (ret) {
-			fprintf(stderr, "minigbm: DRM_IOCTL_EXYNOS_GEM_CREATE failed "
-					"(size=%zu)\n", size);
-			return ret;
+			fprintf(stderr, "drv: DRM_IOCTL_EXYNOS_GEM_CREATE failed (size=%zu)\n",
+				size);
+			goto cleanup_planes;
 		}
 
 		bo->handles[plane].u32 = gem_create.handle;
 	}
 
 	return 0;
+
+cleanup_planes:
+	for (; plane != 0; plane--) {
+		struct drm_gem_close gem_close;
+		memset(&gem_close, 0, sizeof(gem_close));
+		gem_close.handle = bo->handles[plane - 1].u32;
+		int gem_close_ret = drmIoctl(bo->drv->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
+		if (gem_close_ret) {
+			fprintf(stderr, "drv: DRM_IOCTL_GEM_CLOSE failed: %d\n", gem_close_ret);
+		}
+	}
+
+	return ret;
 }
 
-const struct gbm_driver gbm_driver_exynos =
-{
+/*
+ * Use dumb mapping with exynos even though a GEM buffer is created.
+ * libdrm does the same thing in exynos_drm.c
+ */
+struct backend backend_exynos = {
 	.name = "exynos",
-	.bo_create = gbm_exynos_bo_create,
-	.bo_destroy = gbm_gem_bo_destroy,
-	.format_list = {
-		{GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
-		{GBM_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
-		{GBM_FORMAT_NV12, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
-	}
+	.init = exynos_init,
+	.bo_create = exynos_bo_create,
+	.bo_destroy = drv_gem_bo_destroy,
+	.bo_import = drv_prime_bo_import,
+	.bo_map = drv_dumb_bo_map,
+	.bo_unmap = drv_bo_munmap,
 };
 
 #endif