X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=cirrus.c;h=d92bab4260e15a4640c000268df9b996d7c0faf6;hb=02cc8544bd4b8f58356e703b8729e4ca638c5efe;hp=3f2f7ba00b3305d2916cb0a8599cd0599b976754;hpb=1e229399228ac107e8ae0f73a466e3ea17fe5839;p=android-x86%2Fexternal-minigbm.git

diff --git a/cirrus.c b/cirrus.c
index 3f2f7ba..d92bab4 100644
--- a/cirrus.c
+++ b/cirrus.c
@@ -1,22 +1,33 @@
 /*
- * 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.
  */
 
-#include "gbm_priv.h"
+#include "drv_priv.h"
 #include "helpers.h"
+#include "util.h"
 
-struct gbm_driver gbm_driver_cirrus =
+const static uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB888,
+						  DRM_FORMAT_XRGB8888 };
+
+static int cirrus_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;
+
+	return drv_modify_linear_combinations(drv);
+}
+
+struct backend backend_cirrus = {
 	.name = "cirrus",
-	.bo_create = gbm_dumb_bo_create,
-	.bo_destroy = gbm_dumb_bo_destroy,
-	.format_list = {
-		{GBM_FORMAT_RGB888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
-		{GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
-		{GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE | GBM_BO_USE_LINEAR},
-		{GBM_FORMAT_ARGB8888, 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_WRITE | GBM_BO_USE_LINEAR},
-	}
+	.init = cirrus_init,
+	.bo_create = drv_dumb_bo_create,
+	.bo_destroy = drv_dumb_bo_destroy,
+	.bo_import = drv_prime_bo_import,
+	.bo_map = drv_dumb_bo_map,
+	.bo_unmap = drv_bo_munmap,
 };