minigbm: vgem: allow driver creation without planes resources

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

diff --git a/cirrus.c b/cirrus.c
index cda858a..4958fef 100644 (file)
--- a/cirrus.c
+++ b/cirrus.c
@@ -4,19 +4,29 @@
  * found in the LICENSE file.
  */
 
-#include "gbm_priv.h"
+#include "drv_priv.h"
 #include "helpers.h"
+#include "util.h"
 
-const struct gbm_driver gbm_driver_cirrus =
+static struct supported_combination combos[5] = {
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_RGB888,   DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+};
+
+static int cirrus_init(struct driver *drv)
+{
+       drv_insert_combinations(drv, combos, ARRAY_SIZE(combos));
+       return drv_add_kms_flags(drv);
+}
+
+struct backend backend_cirrus =
 {
        .name = "cirrus",
-       .bo_create = gbm_dumb_bo_create,
-       .bo_destroy = gbm_dumb_bo_destroy,
-       .format_list = {
-               {GBM_FORMAT_RGB888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
-               {GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
-               {GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_LINEAR},
-               {GBM_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
-               {GBM_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_LINEAR},
-       }
+       .init = cirrus_init,
+       .bo_create = drv_dumb_bo_create,
+       .bo_destroy = drv_dumb_bo_destroy,
+       .bo_map = drv_dumb_bo_map,
 };