X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=exynos.c;h=5862643eff35d3702c2af6f5ebd35e17e8ba8954;hb=d3f07bd673cdc8a2c165aa2b921cbc21e3e945f2;hp=b21cc2bc2c6efeafc26e72c9def7f28fac4e154f;hpb=ba6bd503a8ac4da5b3f909ded71a3d60451fb372;p=android-x86%2Fexternal-minigbm.git

diff --git a/exynos.c b/exynos.c
index b21cc2b..5862643 100644
--- a/exynos.c
+++ b/exynos.c
@@ -25,22 +25,17 @@ 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;
+	drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+			     &LINEAR_METADATA, BO_USE_RENDER_MASK);
 
-	ret = drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
-				   &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
-	if (ret)
-		return ret;
+	drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
+			     &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
 
 	return drv_modify_linear_combinations(drv);
 }
 
 static int exynos_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-			    uint32_t flags)
+			    uint64_t use_flags)
 {
 	size_t plane;
 
@@ -50,35 +45,34 @@ static int exynos_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint
 		width = ALIGN(width, 16);
 		height = ALIGN(height, 32);
 		chroma_height = ALIGN(height / 2, 32);
-		bo->strides[0] = bo->strides[1] = width;
+		bo->meta.strides[0] = bo->meta.strides[1] = width;
 		/* MFC v8+ requires 64 byte padding in the end of luma and chroma buffers. */
-		bo->sizes[0] = bo->strides[0] * height + 64;
-		bo->sizes[1] = bo->strides[1] * chroma_height + 64;
-		bo->offsets[0] = bo->offsets[1] = 0;
-		bo->total_size = bo->sizes[0] + bo->sizes[1];
+		bo->meta.sizes[0] = bo->meta.strides[0] * height + 64;
+		bo->meta.sizes[1] = bo->meta.strides[1] * chroma_height + 64;
+		bo->meta.offsets[0] = bo->meta.offsets[1] = 0;
+		bo->meta.total_size = bo->meta.sizes[0] + bo->meta.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;
+		bo->meta.strides[0] = drv_stride_from_format(format, width, 0);
+		bo->meta.total_size = bo->meta.sizes[0] = height * bo->meta.strides[0];
+		bo->meta.offsets[0] = 0;
 	} else {
-		fprintf(stderr, "drv: unsupported format %X\n", format);
+		drv_log("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;
+	for (plane = 0; plane < bo->meta.num_planes; plane++) {
+		size_t size = bo->meta.sizes[plane];
+		struct drm_exynos_gem_create gem_create = { 0 };
 
-		memset(&gem_create, 0, sizeof(gem_create));
 		gem_create.size = size;
 		gem_create.flags = EXYNOS_BO_NONCONTIG;
 
 		ret = drmIoctl(bo->drv->fd, DRM_IOCTL_EXYNOS_GEM_CREATE, &gem_create);
 		if (ret) {
-			fprintf(stderr, "drv: DRM_IOCTL_EXYNOS_GEM_CREATE failed (size=%zu)\n",
-				size);
+			drv_log("DRM_IOCTL_EXYNOS_GEM_CREATE failed (size=%zu)\n", size);
+			ret = -errno;
 			goto cleanup_planes;
 		}
 
@@ -89,12 +83,12 @@ static int exynos_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint
 
 cleanup_planes:
 	for (; plane != 0; plane--) {
-		struct drm_gem_close gem_close;
-		memset(&gem_close, 0, sizeof(gem_close));
+		struct drm_gem_close gem_close = { 0 };
+
 		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);
+			drv_log("DRM_IOCTL_GEM_CLOSE failed: %d\n", gem_close_ret);
 		}
 	}
 
@@ -105,7 +99,7 @@ cleanup_planes:
  * 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 = {
+const struct backend backend_exynos = {
 	.name = "exynos",
 	.init = exynos_init,
 	.bo_create = exynos_bo_create,