X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=marvell.c;h=c0b600b5c29a63dff0fcfc275da67e10d9612d80;hb=aead8fab07ce8eaf2568eefdc11520a36b989d10;hp=e088db6e496a56de54f00a970ec995807ffdd889;hpb=458976feb11a1f54af5954deea6f5fdc7fc24ea6;p=android-x86%2Fexternal-minigbm.git

diff --git a/marvell.c b/marvell.c
index e088db6..c0b600b 100644
--- a/marvell.c
+++ b/marvell.c
@@ -10,26 +10,25 @@
 #include "helpers.h"
 #include "util.h"
 
-static struct supported_combination combos[4] = {
-	{DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
-	{DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
-	{DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
-	{DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
-}
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
 
 static int marvell_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_add_linear_combinations(drv, render_target_formats,
+					   ARRAY_SIZE(render_target_formats));
 }
 
-struct backend backend_marvell =
-{
+const struct backend backend_marvell = {
 	.name = "marvell",
 	.init = marvell_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,
 };
 
 #endif