minigbm: cros_gralloc: fix rendernode query

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

diff --git a/evdi.c b/evdi.c
index 428b97c..97042d1 100644 (file)
--- a/evdi.c
+++ b/evdi.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_evdi =
+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 int evdi_init(struct driver *drv)
+{
+       drv_insert_combinations(drv, combos, ARRAY_SIZE(combos));
+       return drv_add_kms_flags(drv);
+}
+
+struct backend backend_evdi =
 {
        .name = "evdi",
-       .bo_create = gbm_dumb_bo_create,
-       .bo_destroy = gbm_dumb_bo_destroy,
-       .format_list = {
-               {GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
-               {GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE | GBM_BO_USE_LINEAR},
-               {GBM_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
-               {GBM_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE | GBM_BO_USE_LINEAR},
-       }
+       .init = evdi_init,
+       .bo_create = drv_dumb_bo_create,
+       .bo_destroy = drv_dumb_bo_destroy,
+       .bo_map = drv_dumb_bo_map,
 };