fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 08:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

winsys/radeon: implement buffer_unmap

Browse source 
This has been a no-op due to performance concerns. From now on, drivers
should decide when they don't want to unmap, not the winsys.

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Marek Olšák 2015-07-16 15:27:34 +02:00
parent 5e3974338e
commit 6b37643b82
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gallium/winsys/radeon/drm/radeon_drm_bo.c
View file

@ -351,14 +351,11 @@ void *radeon_bo_do_map(struct radeon_bo *bo)
if (bo->user_ptr)
return bo->user_ptr;
/* Return the pointer if it's already mapped. */
if (bo->ptr)
return bo->ptr;
/* Map the buffer. */
pipe_mutex_lock(bo->map_mutex);
/* Return the pointer if it's already mapped (in case of a race). */
/* Return the pointer if it's already mapped. */
if (bo->ptr) {
bo->map_count++;
pipe_mutex_unlock(bo->map_mutex);
return bo->ptr;
}
@ -383,6 +380,7 @@ void *radeon_bo_do_map(struct radeon_bo *bo)
return NULL;
}
bo->ptr = ptr;
bo->map_count = 1;
pipe_mutex_unlock(bo->map_mutex);
return bo->ptr;
@ -467,7 +465,26 @@ static void *radeon_bo_map(struct radeon_winsys_cs_handle *buf,
static void radeon_bo_unmap(struct radeon_winsys_cs_handle *_buf)
{
/* NOP */
struct radeon_bo *bo = (struct radeon_bo*)_buf;
if (bo->user_ptr)
return;
pipe_mutex_lock(bo->map_mutex);
if (!bo->ptr) {
pipe_mutex_unlock(bo->map_mutex);
return; /* it's not been mapped */
}
assert(bo->map_count);
if (--bo->map_count) {
pipe_mutex_unlock(bo->map_mutex);
return; /* it's been mapped multiple times */
}
os_munmap(bo->ptr, bo->base.size);
bo->ptr = NULL;
pipe_mutex_unlock(bo->map_mutex);
}
static void radeon_bo_get_base_buffer(struct pb_buffer *buf,

1
src/gallium/winsys/radeon/drm/radeon_drm_bo.h
View file

@ -54,6 +54,7 @@ struct radeon_bo {
void *ptr;
pipe_mutex map_mutex;
unsigned map_count;
uint32_t handle;
uint32_t flink_name;