X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nouveau.c;h=d0f25d4129d47609affbeddec4b5a9c9201def09;hb=d118a0e7466ce9ccabea300fafa2c4c28d468cb5;hp=e0d5954db7227944a24031f3750a4157b74f7b14;hpb=71611d63feec6d7921a1acf7ea52c6b2c2465e4a;p=android-x86%2Fexternal-minigbm.git

diff --git a/nouveau.c b/nouveau.c
index e0d5954..d0f25d4 100644
--- a/nouveau.c
+++ b/nouveau.c
@@ -8,23 +8,22 @@
 #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);
+	drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+			     &LINEAR_METADATA, BO_USE_RENDER_MASK);
+
+	return drv_modify_linear_combinations(drv);
 }
 
-struct backend backend_nouveau =
-{
+const 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,
+	.bo_unmap = drv_bo_munmap,
 };