minigbm: pass in buffer creation flags of the right size

The buffer creation flags are uint64_t, not uint32_t.

BUG=none
TEST=emerge-eve {minigbm, arc-cros-gralloc}

Change-Id: Id94911c5e19c00d47f2fbdca570a6a08fc92b82e
Reviewed-on: https://chromium-review.googlesource.com/691422
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>

diff --git a/amdgpu.c b/amdgpu.c
index da11081..dfd4154 100644 (file)
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -135,7 +135,7 @@ static ADDR_E_RETURNCODE ADDR_API free_sys_mem(const ADDR_FREESYSMEM_INPUT *in)
 }
 
 static int amdgpu_addrlib_compute(void *addrlib, uint32_t width, uint32_t height, uint32_t format,
-                                 uint32_t usage, uint32_t *tiling_flags,
+                                 uint64_t usage, uint32_t *tiling_flags,
                                  ADDR_COMPUTE_SURFACE_INFO_OUTPUT *addr_out)
 {
        ADDR_COMPUTE_SURFACE_INFO_INPUT addr_surf_info_in = { 0 };
@@ -273,7 +273,7 @@ static int amdgpu_init(struct driver *drv)
        int ret;
        void *addrlib;
        struct format_metadata metadata;
-       uint32_t flags = BO_USE_RENDER_MASK;
+       uint64_t flags = BO_USE_RENDER_MASK;
 
        addrlib = amdgpu_addrlib_init(drv_get_fd(drv));
        if (!addrlib)
@@ -345,7 +345,7 @@ static void amdgpu_close(struct driver *drv)
 }
 
 static int amdgpu_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                           uint32_t usage)
+                           uint64_t usage)
 {
        void *addrlib = bo->drv->priv;
        union drm_amdgpu_gem_create gem_create;

diff --git a/drv_priv.h b/drv_priv.h
index e7b2d25..9684e9d 100644 (file)
--- a/drv_priv.h
+++ b/drv_priv.h
@@ -70,7 +70,7 @@ struct backend {
        int (*init)(struct driver *drv);
        void (*close)(struct driver *drv);
        int (*bo_create)(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                        uint32_t flags);
+                        uint64_t flags);
        int (*bo_create_with_modifiers)(struct bo *bo, uint32_t width, uint32_t height,
                                        uint32_t format, const uint64_t *modifiers, uint32_t count);
        int (*bo_destroy)(struct bo *bo);

diff --git a/exynos.c b/exynos.c
index b21cc2b..b620963 100644 (file)
--- a/exynos.c
+++ b/exynos.c
@@ -40,7 +40,7 @@ static int exynos_init(struct driver *drv)
 }
 
 static int exynos_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                           uint32_t flags)
+                           uint64_t flags)
 {
        size_t plane;
 

diff --git a/helpers.c b/helpers.c
index eed2b21..b0c72ad 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -182,7 +182,7 @@ int drv_bo_from_format(struct bo *bo, uint32_t stride, uint32_t aligned_height,
 }
 
 int drv_dumb_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                      uint32_t flags)
+                      uint64_t flags)
 {
        int ret;
        size_t plane;

diff --git a/helpers.h b/helpers.h
index d05e835..2140dd6 100644 (file)
--- a/helpers.h
+++ b/helpers.h
@@ -13,7 +13,7 @@ uint32_t drv_stride_from_format(uint32_t format, uint32_t width, size_t plane);
 uint32_t drv_size_from_format(uint32_t format, uint32_t stride, uint32_t height, size_t plane);
 int drv_bo_from_format(struct bo *bo, uint32_t stride, uint32_t aligned_height, uint32_t format);
 int drv_dumb_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                      uint32_t flags);
+                      uint64_t flags);
 int drv_dumb_bo_destroy(struct bo *bo);
 int drv_map_info_destroy(struct bo *bo);
 int drv_gem_bo_destroy(struct bo *bo);

diff --git a/i915.c b/i915.c
index 3f811d9..4710feb 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -297,7 +297,7 @@ static int i915_init(struct driver *drv)
 }
 
 static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                         uint32_t flags)
+                         uint64_t flags)
 {
        int ret;
        size_t plane;

diff --git a/mediatek.c b/mediatek.c
index d6ec521..fd2c74b 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 flags)
 {
        int ret;
        size_t plane;

diff --git a/rockchip.c b/rockchip.c
index c6fc9ef..860f3b9 100644 (file)
--- a/rockchip.c
+++ b/rockchip.c
@@ -231,7 +231,7 @@ 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,
-                             uint32_t flags)
+                             uint64_t flags)
 {
        uint64_t modifiers[] = { DRM_FORMAT_MOD_NONE };
        return rockchip_bo_create_with_modifiers(bo, width, height, format, modifiers,

diff --git a/tegra.c b/tegra.c
index ad9f871..2281872 100644 (file)
--- a/tegra.c
+++ b/tegra.c
@@ -214,7 +214,7 @@ static int tegra_init(struct driver *drv)
 }
 
 static int tegra_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                          uint32_t flags)
+                          uint64_t flags)
 {
        uint32_t size, stride, block_height_log2 = 0;
        enum nv_mem_kind kind = NV_MEM_KIND_PITCH;

diff --git a/vc4.c b/vc4.c
index 6dca979..dd85bc3 100644 (file)
--- a/vc4.c
+++ b/vc4.c
@@ -31,7 +31,7 @@ static int vc4_init(struct driver *drv)
 }
 
 static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                        uint32_t flags)
+                        uint64_t flags)
 {
        int ret;
        size_t plane;

diff --git a/vgem.c b/vgem.c
index 0152b47..d5dc823 100644 (file)
--- a/vgem.c
+++ b/vgem.c
@@ -35,7 +35,7 @@ static int vgem_init(struct driver *drv)
 }
 
 static int vgem_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                         uint32_t flags)
+                         uint64_t flags)
 {
        width = ALIGN(width, MESA_LLVMPIPE_TILE_SIZE);
        height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE);

diff --git a/virtio_gpu.c b/virtio_gpu.c
index afdb5a2..49e2e7a 100644 (file)
--- a/virtio_gpu.c
+++ b/virtio_gpu.c
@@ -35,7 +35,7 @@ static int virtio_gpu_init(struct driver *drv)
 }
 
 static int virtio_gpu_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
-                               uint32_t flags)
+                               uint64_t flags)
 {
        width = ALIGN(width, MESA_LLVMPIPE_TILE_SIZE);
        height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE);