1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From 85c24ccfff0ff14405a55225e4ef5ada3461e60d Mon Sep 17 00:00:00 2001
From: Yong Zhao <yong.zhao@amd.com>
Date: Wed, 6 Apr 2016 14:48:38 -0400
Subject: [PATCH 1389/4131] adapt cto new amdgpu_vm_bo_map()
Change-Id: I89485f3dd4bb463fe9b60c3620f757e5e77a2a5d
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 66b400f..ab9366d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -113,6 +113,8 @@ static int add_bo_to_vm(struct amdgpu_device *adev, uint64_t va,
goto err_vmsetaddr;
}
+ amdgpu_bo_unreserve(bo);
+
bo_va_entry->kgd_dev = (void *)adev;
bo_va_entry->is_mapped = false;
list_add(&bo_va_entry->bo_list, list_bo_va);
@@ -120,7 +122,6 @@ static int add_bo_to_vm(struct amdgpu_device *adev, uint64_t va,
return 0;
err_vmsetaddr:
- amdgpu_bo_reserve(bo, true);
amdgpu_vm_bo_rmv(adev, bo_va_entry->bo_va);
/* This will put the bo_va_mapping on the vm->freed
* list. amdgpu_vm_clear_freed needs the PTs to be reserved so
--
2.7.4
|
