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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 12cd7b6085de3ee851ffa0ce2d8ff83575f322b9 Mon Sep 17 00:00:00 2001
From: Yong Zhao <yong.zhao@amd.com>
Date: Tue, 19 Apr 2016 14:16:04 -0400
Subject: [PATCH 1392/4131] Do add_bo_to_vm() when BO gets mapped instead of
allocated
Change-Id: Ie46623f0b1f8fda40051a8333aaa7b06388a83e2
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 8d421f5..bc36743 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -377,21 +377,6 @@ static int __alloc_memory_of_gpu(struct kgd_dev *kgd, uint64_t va,
}
}
- ret = add_bo_to_vm(adev, va, vm, bo, &(*mem)->data2.bo_va_list,
- (*mem)->data2.readonly, (*mem)->data2.execute);
- if (ret != 0)
- goto err_map;
-
- if (aql_queue) {
- ret = add_bo_to_vm(adev, va + size,
- vm, bo, &(*mem)->data2.bo_va_list,
- (*mem)->data2.readonly, (*mem)->data2.execute);
- if (ret != 0)
- goto err_map;
- }
-
- pr_debug("Set BO to VA %p\n", (void *) va);
-
if (kptr) {
ret = amdgpu_bo_reserve(bo, true);
if (ret) {
@@ -431,7 +416,6 @@ static int __alloc_memory_of_gpu(struct kgd_dev *kgd, uint64_t va,
allocate_mem_pin_bo_failed:
amdgpu_bo_unreserve(bo);
allocate_mem_reserve_bo_failed:
-err_map:
if (userptr)
amdgpu_mn_unregister(bo);
allocate_mem_set_userptr_failed:
--
2.7.4
|
