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>
This commit is contained in:
Gurchetan Singh 2017-09-28 16:25:12 -07:00 committed by chrome-bot
parent bc24bd757b
commit 60ee5833b1
12 changed files with 14 additions and 14 deletions

View file

@ -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, 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_OUTPUT *addr_out)
{ {
ADDR_COMPUTE_SURFACE_INFO_INPUT addr_surf_info_in = { 0 }; ADDR_COMPUTE_SURFACE_INFO_INPUT addr_surf_info_in = { 0 };
@ -273,7 +273,7 @@ static int amdgpu_init(struct driver *drv)
int ret; int ret;
void *addrlib; void *addrlib;
struct format_metadata metadata; 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)); addrlib = amdgpu_addrlib_init(drv_get_fd(drv));
if (!addrlib) 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, 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; void *addrlib = bo->drv->priv;
union drm_amdgpu_gem_create gem_create; union drm_amdgpu_gem_create gem_create;

View file

@ -70,7 +70,7 @@ struct backend {
int (*init)(struct driver *drv); int (*init)(struct driver *drv);
void (*close)(struct driver *drv); void (*close)(struct driver *drv);
int (*bo_create)(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, 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, int (*bo_create_with_modifiers)(struct bo *bo, uint32_t width, uint32_t height,
uint32_t format, const uint64_t *modifiers, uint32_t count); uint32_t format, const uint64_t *modifiers, uint32_t count);
int (*bo_destroy)(struct bo *bo); int (*bo_destroy)(struct bo *bo);

View file

@ -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, 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; size_t plane;

View file

@ -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, 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; int ret;
size_t plane; size_t plane;

View file

@ -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); 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_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, 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_dumb_bo_destroy(struct bo *bo);
int drv_map_info_destroy(struct bo *bo); int drv_map_info_destroy(struct bo *bo);
int drv_gem_bo_destroy(struct bo *bo); int drv_gem_bo_destroy(struct bo *bo);

2
i915.c
View file

@ -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, 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; int ret;
size_t plane; size_t plane;

View file

@ -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, 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; int ret;
size_t plane; size_t plane;

View file

@ -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, 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 }; uint64_t modifiers[] = { DRM_FORMAT_MOD_NONE };
return rockchip_bo_create_with_modifiers(bo, width, height, format, modifiers, return rockchip_bo_create_with_modifiers(bo, width, height, format, modifiers,

View file

@ -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, 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; uint32_t size, stride, block_height_log2 = 0;
enum nv_mem_kind kind = NV_MEM_KIND_PITCH; enum nv_mem_kind kind = NV_MEM_KIND_PITCH;

2
vc4.c
View file

@ -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, 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; int ret;
size_t plane; size_t plane;

2
vgem.c
View file

@ -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, 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); width = ALIGN(width, MESA_LLVMPIPE_TILE_SIZE);
height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE); height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE);

View file

@ -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, 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); width = ALIGN(width, MESA_LLVMPIPE_TILE_SIZE);
height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE); height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE);