Revert "minigbm: align multi-planar formats to 16"

[android-x86/external-minigbm.git] / marvell.c

diff --git a/marvell.c b/marvell.c
index 956223b..455b033 100644 (file)
--- a/marvell.c
+++ b/marvell.c
@@ -8,19 +8,30 @@
 
 #include "drv_priv.h"
 #include "helpers.h"
+#include "util.h"
 
-const struct backend backend_marvell =
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
+
+static int marvell_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_add_linear_combinations(drv, render_target_formats,
+                                          ARRAY_SIZE(render_target_formats));
+}
+
+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,
-       .format_list = {
-               {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
-               {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-               {DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
-               {DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       }
+       .bo_unmap = drv_bo_munmap,
 };
 
 #endif