summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-12-06 22:10:04 +0100
committerMarek Olšák <[email protected]>2015-12-11 15:25:12 +0100
commit3d090223ef803d6c0c4f7b69329456502b882f22 (patch)
tree2b72cbe84029b444d2d672d72ee8f51b14a9e053
parent1e05812fcd66b07c9f5ceb7a663845abcebc24cc (diff)
winsys/radeon: remove redundant radeon_bomgr::va
Reviewed-by: Nicolai Hähnle <[email protected]> Reviewed-by: Edward O'Callaghan <[email protected]> Reviewed-by: Michel Dänzer <[email protected]>
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_drm_bo.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 7f395b704c7..7f46955047a 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -72,8 +72,6 @@ struct radeon_bomgr {
pipe_mutex bo_handles_mutex;
pipe_mutex bo_va_mutex;
- /* is virtual address supported */
- bool va;
uint64_t va_offset;
struct list_head va_holes;
@@ -331,7 +329,7 @@ static void radeon_bo_destroy(struct pb_buffer *_buf)
if (bo->ptr)
os_munmap(bo->ptr, bo->base.size);
- if (mgr->va) {
+ if (mgr->rws->info.r600_virtual_address) {
if (bo->rws->va_unmap_working) {
struct drm_radeon_gem_va va;
@@ -611,7 +609,7 @@ static struct pb_buffer *radeon_bomgr_create_bo(struct pb_manager *_mgr,
bo->initial_domain = rdesc->initial_domains;
pipe_mutex_init(bo->map_mutex);
- if (mgr->va) {
+ if (mgr->rws->info.r600_virtual_address) {
struct drm_radeon_gem_va va;
bo->va = radeon_bomgr_find_va(mgr, size, desc->alignment);
@@ -721,7 +719,6 @@ struct pb_manager *radeon_bomgr_create(struct radeon_drm_winsys *rws)
pipe_mutex_init(mgr->bo_handles_mutex);
pipe_mutex_init(mgr->bo_va_mutex);
- mgr->va = rws->info.r600_virtual_address;
mgr->va_offset = rws->va_start;
list_inithead(&mgr->va_holes);
@@ -967,7 +964,7 @@ static struct pb_buffer *radeon_winsys_bo_from_ptr(struct radeon_winsys *rws,
pipe_mutex_unlock(mgr->bo_handles_mutex);
- if (mgr->va) {
+ if (mgr->rws->info.r600_virtual_address) {
struct drm_radeon_gem_va va;
bo->va = radeon_bomgr_find_va(mgr, bo->base.size, 1 << 20);
@@ -1101,7 +1098,7 @@ done:
if (stride)
*stride = whandle->stride;
- if (mgr->va && !bo->va) {
+ if (mgr->rws->info.r600_virtual_address && !bo->va) {
struct drm_radeon_gem_va va;
bo->va = radeon_bomgr_find_va(mgr, bo->base.size, 1 << 20);