geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeon: don't map/unmap explicitly. 

This caches the mapping and just use mapping as a sync point
main
Dave Airlie 2009-08-01 16:47:24 +10:00
parent 5a73f066ba
commit 322cf6cf73
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libdrm/radeon/radeon_bo_gem.c
View File

@ -49,6 +49,7 @@ struct radeon_bo_gem {
struct radeon_bo base; struct radeon_bo base;
uint32_t name; uint32_t name;
int map_count; int map_count;
void *priv_ptr;
}; };
struct bo_manager_gem { struct bo_manager_gem {
@ -130,8 +131,8 @@ static struct radeon_bo *bo_unref(struct radeon_bo *bo)
if (bo->cref) { if (bo->cref) {
return bo; return bo;
} }
if (bo_gem->map_count) { if (bo_gem->priv_ptr) {
munmap(bo->ptr, bo->size); munmap(bo_gem->priv_ptr, bo->size);
} }
/* close object */ /* close object */
@ -152,6 +153,14 @@ static int bo_map(struct radeon_bo *bo, int write)
if (bo_gem->map_count++ != 0) { if (bo_gem->map_count++ != 0) {
return 0; return 0;
} }
if (bo_gem->priv_ptr) {
r = bo_wait(bo);
bo->ptr = bo_gem->priv_ptr;
if (r)
return r;
return 0;
}
bo->ptr = NULL; bo->ptr = NULL;
args.handle = bo->handle; args.handle = bo->handle;
args.offset = 0; args.offset = 0;
@ -168,8 +177,8 @@ static int bo_map(struct radeon_bo *bo, int write)
ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, bo->bom->fd, args.addr_ptr); ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, bo->bom->fd, args.addr_ptr);
if (ptr == MAP_FAILED) if (ptr == MAP_FAILED)
return -errno; return -errno;
bo->ptr = ptr; bo_gem->priv_ptr = ptr;
bo->ptr = bo_gem->priv_ptr;
return r; return r;
} }
@ -180,7 +189,7 @@ static int bo_unmap(struct radeon_bo *bo)
if (--bo_gem->map_count > 0) { if (--bo_gem->map_count > 0) {
return 0; return 0;
} }
munmap(bo->ptr, bo->size); //munmap(bo->ptr, bo->size);
bo->ptr = NULL; bo->ptr = NULL;
return 0; return 0;
} }