X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nouveau.c;h=7cdab3a040ddf1b805eb87828c814b0fe6aa3ba6;hb=4b5d0bf2ab4da0f475f01575fb369b7eb9415d7c;hp=89122da75b7d6514955de9220b81bca17adcb6ce;hpb=7a755de4f3d105f50a6c8ba25c74ff8e97653159;p=android-x86%2Fexternal-minigbm.git

diff --git a/nouveau.c b/nouveau.c
index 89122da..7cdab3a 100644
--- a/nouveau.c
+++ b/nouveau.c
@@ -8,22 +8,24 @@
 #include "helpers.h"
 #include "util.h"
 
-static struct supported_combination combos[2] = {
-	{DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_RENDERING},
-	{DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_RENDERING},
-};
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
 
 static int nouveau_init(struct driver *drv)
 {
-	drv_insert_combinations(drv, combos, ARRAY_SIZE(combos));
-	return drv_add_kms_flags(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_nouveau =
-{
+struct backend backend_nouveau = {
 	.name = "nouveau",
 	.init = nouveau_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,
 };