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
49
50
51
52
53
54
55
56
57
|
From fb19121ee88e9eefac4009d8b5218d9831427a82 Mon Sep 17 00:00:00 2001
From: Evan Quan <evan.quan@amd.com>
Date: Thu, 13 Apr 2017 14:43:58 +0800
Subject: [PATCH 1656/4131] drm/amdgpu: remove the unused vm_manager lock - the
vm_manager lock was removed by "drm/amdgpu: split VMID management by VMHUB" -
fine granularity lock was introduced stead
Change-Id: I5bfb4e1d1ad41b30f0bd2f1d6a4cb412eadf127b
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Yong Zhao <Yong.Zhao@amd.com>
Conflicts:
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index c300397..fb68019 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2601,7 +2601,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
vm->vm_context = vm_context;
if (vm_context == AMDGPU_VM_CONTEXT_COMPUTE) {
- mutex_lock(&adev->vm_manager.lock);
if (adev->vm_manager.n_compute_vms++ == 0) {
/* First Compute VM: enable compute power profile */
@@ -2612,7 +2611,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
adev->pm.funcs->switch_power_profile(adev,
AMD_PP_COMPUTE_PROFILE);
}
- mutex_unlock(&adev->vm_manager.lock);
}
return 0;
@@ -2671,7 +2669,6 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
int i;
if (vm->vm_context == AMDGPU_VM_CONTEXT_COMPUTE) {
- mutex_lock(&adev->vm_manager.lock);
WARN(adev->vm_manager.n_compute_vms == 0, "Unbalanced number of Compute VMs");
@@ -2684,7 +2681,6 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
adev->pm.funcs->switch_power_profile(adev,
AMD_PP_GFX_PROFILE);
}
- mutex_unlock(&adev->vm_manager.lock);
}
amd_sched_entity_fini(vm->entity.sched, &vm->entity);
--
2.7.4
|
