diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-amd/0011-drm-radeon-fix-VMID-use-tracking.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-amd/0011-drm-radeon-fix-VMID-use-tracking.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-amd/0011-drm-radeon-fix-VMID-use-tracking.patch b/common/recipes-kernel/linux/linux-amd/0011-drm-radeon-fix-VMID-use-tracking.patch new file mode 100644 index 00000000..48343177 --- /dev/null +++ b/common/recipes-kernel/linux/linux-amd/0011-drm-radeon-fix-VMID-use-tracking.patch @@ -0,0 +1,71 @@ +From ee906e626e202a3fd97bbffd9377eead953eac2c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Sat, 14 Dec 2013 10:02:57 -0700 +Subject: [PATCH 11/60] drm/radeon: fix VMID use tracking +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise we allocate a new VMID on nearly every submit. + +Signed-off-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/radeon/radeon.h | 2 ++ + drivers/gpu/drm/radeon/radeon_gart.c | 8 +++++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h +index f1ce3064..133e9ad 100644 +--- a/drivers/gpu/drm/radeon/radeon.h ++++ b/drivers/gpu/drm/radeon/radeon.h +@@ -863,6 +863,8 @@ struct radeon_vm { + struct radeon_fence *fence; + /* last flush or NULL if we still need to flush */ + struct radeon_fence *last_flush; ++ /* last use of vmid */ ++ struct radeon_fence *last_id_use; + }; + + struct radeon_vm_manager { +diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c +index f8d7b16..cdab083 100644 +--- a/drivers/gpu/drm/radeon/radeon_gart.c ++++ b/drivers/gpu/drm/radeon/radeon_gart.c +@@ -688,7 +688,7 @@ struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev, + unsigned i; + + /* 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; + + /* we definately need to flush */ +@@ -743,6 +743,9 @@ void radeon_vm_fence(struct radeon_device *rdev, + + radeon_fence_unref(&vm->fence); + vm->fence = radeon_fence_ref(fence); ++ ++ radeon_fence_unref(&vm->last_id_use); ++ vm->last_id_use = radeon_fence_ref(fence); + } + + /** +@@ -1246,6 +1249,8 @@ void radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm) + { + vm->id = 0; + vm->fence = NULL; ++ vm->last_flush = NULL; ++ vm->last_id_use = NULL; + mutex_init(&vm->mutex); + INIT_LIST_HEAD(&vm->list); + INIT_LIST_HEAD(&vm->va); +@@ -1284,5 +1289,6 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm) + } + radeon_fence_unref(&vm->fence); + radeon_fence_unref(&vm->last_flush); ++ radeon_fence_unref(&vm->last_id_use); + mutex_unlock(&vm->mutex); + } +-- +1.9.1 + |