leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/radeon: fix VMID use tracking

Browse Source 
Otherwise we allocate a new VMID on nearly every submit.

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König
2014-01-23 14:24:15 +01:00
committed by Alex Deucher
parent 45ab1e0780
commit 593b26353f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/radeon/radeon.h
View File

@@ -867,6 +867,8 @@ struct radeon_vm {
struct radeon_fence *fence; struct radeon_fence *fence;
/* last flush or NULL if we still need to flush */ /* last flush or NULL if we still need to flush */
struct radeon_fence *last_flush; struct radeon_fence *last_flush;
/* last use of vmid */
struct radeon_fence *last_id_use;
}; };
struct radeon_vm_manager { struct radeon_vm_manager {

8
drivers/gpu/drm/radeon/radeon_gart.c
View File

@@ -713,7 +713,7 @@ struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev,
unsigned i; unsigned i;
/* check if the id is still valid */ /* check if the id is still valid */
if (vm->fence && vm->fence == rdev->vm_manager.active[vm->id]) if (vm->last_id_use && vm->last_id_use == rdev->vm_manager.active[vm->id])
return NULL; return NULL;
/* we definately need to flush */ /* we definately need to flush */
@@ -769,6 +769,9 @@ void radeon_vm_fence(struct radeon_device *rdev,
radeon_fence_unref(&vm->fence); radeon_fence_unref(&vm->fence);
vm->fence = radeon_fence_ref(fence); vm->fence = radeon_fence_ref(fence);
radeon_fence_unref(&vm->last_id_use);
vm->last_id_use = radeon_fence_ref(fence);
} }
/** /**
@@ -1303,6 +1306,8 @@ void radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm)
{ {
vm->id = 0; vm->id = 0;
vm->fence = NULL; vm->fence = NULL;
vm->last_flush = NULL;
vm->last_id_use = NULL;
mutex_init(&vm->mutex); mutex_init(&vm->mutex);
INIT_LIST_HEAD(&vm->list); INIT_LIST_HEAD(&vm->list);
INIT_LIST_HEAD(&vm->va); INIT_LIST_HEAD(&vm->va);
@@ -1341,5 +1346,6 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm)
} }
radeon_fence_unref(&vm->fence); radeon_fence_unref(&vm->fence);
radeon_fence_unref(&vm->last_flush); radeon_fence_unref(&vm->last_flush);
radeon_fence_unref(&vm->last_id_use);
mutex_unlock(&vm->mutex); mutex_unlock(&vm->mutex);
} }