msm: Align buffer dimensions for llvmpipe

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

diff --git a/mediatek.c b/mediatek.c
index 33f57fd..7614004 100644 (file)
--- a/mediatek.c
+++ b/mediatek.c
@@ -32,16 +32,11 @@ static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_YVU
 
 static int mediatek_init(struct driver *drv)
 {
-       int ret;
-       ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
-                                  &LINEAR_METADATA, BO_USE_RENDER_MASK);
-       if (ret)
-               return ret;
+       drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+                            &LINEAR_METADATA, BO_USE_RENDER_MASK);
 
-       ret = drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
-                                  &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
-       if (ret)
-               return ret;
+       drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
+                            &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
 
        return drv_modify_linear_combinations(drv);
 }
@@ -78,8 +73,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 mapping *mapping, size_t plane,
-                            uint32_t map_flags)
+static void *mediatek_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags)
 {
        int ret;
        struct drm_mtk_gem_map_off gem_map;
@@ -97,31 +91,40 @@ static void *mediatek_bo_map(struct bo *bo, struct mapping *mapping, size_t plan
        void *addr = mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
                          gem_map.offset);
 
-       mapping->vma->length = bo->total_size;
+       vma->length = bo->total_size;
 
        if (bo->use_flags & BO_USE_RENDERSCRIPT) {
                priv = calloc(1, sizeof(*priv));
                priv->cached_addr = calloc(1, bo->total_size);
                priv->gem_addr = addr;
-               memcpy(priv->cached_addr, priv->gem_addr, bo->total_size);
-               mapping->vma->priv = priv;
+               vma->priv = priv;
                addr = priv->cached_addr;
        }
 
        return addr;
 }
 
-static int mediatek_bo_unmap(struct bo *bo, struct mapping *mapping)
+static int mediatek_bo_unmap(struct bo *bo, struct vma *vma)
 {
-       if (mapping->vma->priv) {
-               struct mediatek_private_map_data *priv = mapping->vma->priv;
-               mapping->vma->addr = priv->gem_addr;
+       if (vma->priv) {
+               struct mediatek_private_map_data *priv = vma->priv;
+               vma->addr = priv->gem_addr;
                free(priv->cached_addr);
                free(priv);
-               mapping->vma->priv = NULL;
+               vma->priv = NULL;
        }
 
-       return munmap(mapping->vma->addr, mapping->vma->length);
+       return munmap(vma->addr, vma->length);
+}
+
+static int mediatek_bo_invalidate(struct bo *bo, struct mapping *mapping)
+{
+       if (mapping->vma->priv) {
+               struct mediatek_private_map_data *priv = mapping->vma->priv;
+               memcpy(priv->cached_addr, priv->gem_addr, bo->total_size);
+       }
+
+       return 0;
 }
 
 static int mediatek_bo_flush(struct bo *bo, struct mapping *mapping)
@@ -154,6 +157,7 @@ const struct backend backend_mediatek = {
        .bo_import = drv_prime_bo_import,
        .bo_map = mediatek_bo_map,
        .bo_unmap = mediatek_bo_unmap,
+       .bo_invalidate = mediatek_bo_invalidate,
        .bo_flush = mediatek_bo_flush,
        .resolve_format = mediatek_resolve_format,
 };