minigbm: pass in map flags to (*bo_map) callback

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

diff --git a/mediatek.c b/mediatek.c
index a4879d9..8494c3d 100644 (file)
--- a/mediatek.c
+++ b/mediatek.c
@@ -47,7 +47,7 @@ static int mediatek_init(struct driver *drv)
 }
 
 static int mediatek_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                             uint32_t flags)
+                             uint64_t use_flags)
 {
        int ret;
        size_t plane;
@@ -78,7 +78,7 @@ static int mediatek_bo_create(struct bo *bo, uint32_t width, uint32_t height, ui
        return 0;
 }
 
-static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane, int prot)
+static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane, uint32_t map_flags)
 {
        int ret;
        struct drm_mtk_gem_map_off gem_map;
@@ -93,11 +93,12 @@ static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane,
                return MAP_FAILED;
        }
 
-       void *addr = mmap(0, bo->total_size, prot, MAP_SHARED, bo->drv->fd, gem_map.offset);
+       void *addr = mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
+                         gem_map.offset);
 
        data->length = bo->total_size;
 
-       if (bo->flags & BO_USE_RENDERSCRIPT) {
+       if (bo->use_flags & BO_USE_RENDERSCRIPT) {
                priv = calloc(1, sizeof(*priv));
                priv->cached_addr = calloc(1, bo->total_size);
                priv->gem_addr = addr;
@@ -113,7 +114,6 @@ static int mediatek_bo_unmap(struct bo *bo, struct map_info *data)
 {
        if (data->priv) {
                struct mediatek_private_map_data *priv = data->priv;
-               memcpy(priv->gem_addr, priv->cached_addr, bo->total_size);
                data->addr = priv->gem_addr;
                free(priv->cached_addr);
                free(priv);
@@ -123,7 +123,16 @@ static int mediatek_bo_unmap(struct bo *bo, struct map_info *data)
        return munmap(data->addr, data->length);
 }
 
-static uint32_t mediatek_resolve_format(uint32_t format, uint64_t usage)
+static int mediatek_bo_flush(struct bo *bo, struct map_info *data)
+{
+       struct mediatek_private_map_data *priv = data->priv;
+       if (priv)
+               memcpy(priv->gem_addr, priv->cached_addr, bo->total_size);
+
+       return 0;
+}
+
+static uint32_t mediatek_resolve_format(uint32_t format, uint64_t use_flags)
 {
        switch (format) {
        case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
@@ -144,6 +153,7 @@ struct backend backend_mediatek = {
        .bo_import = drv_prime_bo_import,
        .bo_map = mediatek_bo_map,
        .bo_unmap = mediatek_bo_unmap,
+       .bo_flush = mediatek_bo_flush,
        .resolve_format = mediatek_resolve_format,
 };