fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 23:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vc4: Use GEM under simulation even for non-winsys BOs.

Browse source 
In addition to reducing sim-specific code, it also avoids our local handle
allocation conflicting with the host GEM's handle numbering, which was
causing vc4_gem_hindex() to not distinguish between winsys BOs and the
same-numbered non-winsys bo.
This commit is contained in:
Eric Anholt 2014-08-04 13:01:29 -07:00
parent cdc208bdaf
commit 8ebfa8fdb2
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/vc4/vc4_bufmgr.c
View file

@ -45,7 +45,6 @@ vc4_bo_alloc(struct vc4_screen *screen, uint32_t size, const char *name)
bo->size = size;
bo->name = name;
#ifndef USE_VC4_SIMULATOR
struct drm_mode_create_dumb create;
memset(&create, 0, sizeof(create));
@ -59,12 +58,6 @@ vc4_bo_alloc(struct vc4_screen *screen, uint32_t size, const char *name)
bo->handle = create.handle;
assert(create.size >= size);
#else /* USE_VC4_SIMULATOR */
static int next_handle = 0;
bo->handle = next_handle++;
bo->map = malloc(size);
#endif /* USE_VC4_SIMULATOR */
return bo;
}
@ -72,20 +65,23 @@ vc4_bo_alloc(struct vc4_screen *screen, uint32_t size, const char *name)
void
vc4_bo_free(struct vc4_bo *bo)
{
#ifndef USE_VC4_SIMULATOR
struct vc4_screen *screen = bo->screen;
if (bo->map)
if (bo->map) {
#ifdef USE_VC4_SIMULATOR
if (bo->simulator_winsys_map) {
free(bo->map);
bo->map = bo->simulator_winsys_map;
}
#endif
munmap(bo->map, bo->size);
}
struct drm_gem_close c;
c.handle = bo->handle;
int ret = drmIoctl(screen->fd, DRM_IOCTL_GEM_CLOSE, &c);
if (ret != 0)
fprintf(stderr, "close object %d: %s\n", bo->handle, strerror(errno));
#else
free(bo->map);
#endif
free(bo);
}
@ -137,7 +133,6 @@ vc4_bo_alloc_mem(struct vc4_screen *screen, const void *data, uint32_t size,
bool
vc4_bo_flink(struct vc4_bo *bo, uint32_t *name)
{
#ifndef USE_VC4_SIMULATOR
struct drm_gem_flink flink = {
.handle = bo->handle,
};
@ -150,7 +145,6 @@ vc4_bo_flink(struct vc4_bo *bo, uint32_t *name)
}
*name = flink.name;
#endif /* USE_VC4_SIMULATOR */
return true;
}

1
src/gallium/drivers/vc4/vc4_simulator.c
View file

@ -75,6 +75,7 @@ vc4_simulator_pin_bos(struct drm_device *dev, struct exec_info *exec)
struct vc4_bo *bo = bos[i];
struct drm_gem_cma_object *obj = vc4_wrap_bo_with_cma(dev, bo);
vc4_bo_map(bo);
memcpy(obj->vaddr, bo->map, bo->size);
exec->bo[i].bo = obj;