gralloc0_register_buffer: initialize gralloc0 when needed

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

diff --git a/rockchip.c b/rockchip.c
index 58a60aa..5fb0be4 100644 (file)
--- a/rockchip.c
+++ b/rockchip.c
@@ -118,7 +118,7 @@ static int rockchip_init(struct driver *drv)
 
        metadata.tiling = 0;
        metadata.priority = 1;
-       metadata.modifier = DRM_FORMAT_MOD_NONE;
+       metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
        ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
                                   &metadata, BO_USE_RENDER_MASK);
@@ -192,7 +192,7 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint
                 * pick that */
                afbc_bo_from_format(bo, width, height, format);
        } else {
-               if (!has_modifier(modifiers, count, DRM_FORMAT_MOD_NONE)) {
+               if (!has_modifier(modifiers, count, DRM_FORMAT_MOD_LINEAR)) {
                        errno = EINVAL;
                        fprintf(stderr, "no usable modifier found\n");
                        return -1;
@@ -234,12 +234,12 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint
 static int rockchip_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
                              uint64_t use_flags)
 {
-       uint64_t modifiers[] = { DRM_FORMAT_MOD_NONE };
+       uint64_t modifiers[] = { DRM_FORMAT_MOD_LINEAR };
        return rockchip_bo_create_with_modifiers(bo, width, height, format, modifiers,
                                                 ARRAY_SIZE(modifiers));
 }
 
-static void *rockchip_bo_map(struct bo *bo, struct map_info *data, size_t plane, int prot)
+static void *rockchip_bo_map(struct bo *bo, struct map_info *data, size_t plane, uint32_t map_flags)
 {
        int ret;
        struct drm_rockchip_gem_map_off gem_map;
@@ -259,7 +259,8 @@ static void *rockchip_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;
 
@@ -291,7 +292,7 @@ static int rockchip_bo_unmap(struct bo *bo, struct map_info *data)
 static int rockchip_bo_flush(struct bo *bo, struct map_info *data)
 {
        struct rockchip_private_map_data *priv = data->priv;
-       if (priv)
+       if (priv && (data->map_flags & BO_MAP_WRITE))
                memcpy(priv->gem_addr, priv->cached_addr, bo->total_size);
 
        return 0;