aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0352-drm-amdgpu-sync-to-the-active-user-on-reusing-a-VMID.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0352-drm-amdgpu-sync-to-the-active-user-on-reusing-a-VMID.patch')
-rw-r--r--common/recipes-kernel/linux/files/0352-drm-amdgpu-sync-to-the-active-user-on-reusing-a-VMID.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0352-drm-amdgpu-sync-to-the-active-user-on-reusing-a-VMID.patch b/common/recipes-kernel/linux/files/0352-drm-amdgpu-sync-to-the-active-user-on-reusing-a-VMID.patch
new file mode 100644
index 00000000..3094c72c
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0352-drm-amdgpu-sync-to-the-active-user-on-reusing-a-VMID.patch
@@ -0,0 +1,37 @@
+From 94f6825d010153b141f45831b76e26437470e81a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Thu, 3 Mar 2016 10:50:01 +0100
+Subject: [PATCH 0352/1110] drm/amdgpu: sync to the active user on reusing a
+ VMID
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+index 5bea6da..6e23841 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+@@ -195,6 +195,13 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
+ if (!is_later && owner == (long)id &&
+ pd_addr == id->pd_gpu_addr) {
+
++ r = amdgpu_sync_fence(ring->adev, sync,
++ id->mgr_id->active);
++ if (r) {
++ mutex_unlock(&adev->vm_manager.lock);
++ return r;
++ }
++
+ fence_put(id->mgr_id->active);
+ id->mgr_id->active = fence_get(fence);
+
+--
+2.7.4
+