[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709...

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

diff --git a/evdi.c b/evdi.c
index 3aeee2c..bfa62a0 100644 (file)
--- a/evdi.c
+++ b/evdi.c
@@ -4,19 +4,26 @@
  * 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 const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
+
+static int evdi_init(struct driver *drv)
 {
+       drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+                            &LINEAR_METADATA, BO_USE_RENDER_MASK);
+
+       return drv_modify_linear_combinations(drv);
+}
+
+const 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_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 = evdi_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,
 };
-