minigbm: cros_gralloc: Use pkg-config for LIBS

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

diff --git a/marvell.c b/marvell.c
index ae3dc45..d39e264 100644 (file)
--- a/marvell.c
+++ b/marvell.c
@@ -10,23 +10,14 @@
 #include "helpers.h"
 #include "util.h"
 
-static struct supported_combination combos[2] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_RENDERING | BO_USE_SW_READ_OFTEN |
-               BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_RENDERING | BO_USE_SW_READ_OFTEN |
-               BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
-}
+static const uint32_t supported_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);
+       return drv_add_linear_combinations(drv, supported_formats, ARRAY_SIZE(supported_formats));
 }
 
-struct backend backend_marvell =
-{
+struct backend backend_marvell = {
        .name = "marvell",
        .init = marvell_init,
        .bo_create = drv_dumb_bo_create,