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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
From 3b3291708b284b3d78f8a7b7a47f98125f3273dd Mon Sep 17 00:00:00 2001
From: Jim Qu <Jim.Qu@amd.com>
Date: Mon, 22 Jan 2018 16:01:18 +0800
Subject: [PATCH 3180/4131] Revert "drm/amdgpu: always allocate a PASIDs for
each VM v2"
This reverts commit c5867fb4c587e9469aca28265ecd2ba6a74d8269.
The original patch depend on dma-buf: make returning the
exclusive fence optional in core kernel. now revert the patch
until dma-buf patch is ready in kernel distro.
Signed-off-by: Jim Qu <Jim.Qu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 43 +++++++++++----------------------
1 file changed, 14 insertions(+), 29 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 65d69a9..efa2b48 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -862,7 +862,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
{
struct amdgpu_device *adev = dev->dev_private;
struct amdgpu_fpriv *fpriv;
- int r, pasid;
+ int r;
file_priv->driver_priv = NULL;
@@ -876,25 +876,28 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
goto out_suspend;
}
- pasid = amdgpu_pasid_alloc(16);
- if (pasid < 0) {
- dev_warn(adev->dev, "No more PASIDs available!");
- pasid = 0;
+ r = amdgpu_vm_init(adev, &fpriv->vm,
+ AMDGPU_VM_CONTEXT_GFX, 0);
+ if (r) {
+ kfree(fpriv);
+ goto out_suspend;
}
- r = amdgpu_vm_init(adev, &fpriv->vm, AMDGPU_VM_CONTEXT_GFX, pasid);
- if (r)
- goto error_pasid;
fpriv->prt_va = amdgpu_vm_bo_add(adev, &fpriv->vm, NULL);
if (!fpriv->prt_va) {
r = -ENOMEM;
- goto error_vm;
+ amdgpu_vm_fini(adev, &fpriv->vm);
+ kfree(fpriv);
+ goto out_suspend;
}
if (amdgpu_sriov_vf(adev)) {
r = amdgpu_map_static_csa(adev, &fpriv->vm, &fpriv->csa_va);
- if (r)
- goto error_vm;
+ if (r) {
+ amdgpu_vm_fini(adev, &fpriv->vm);
+ kfree(fpriv);
+ goto out_suspend;
+ }
}
mutex_init(&fpriv->bo_list_lock);
@@ -905,16 +908,6 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
amdgpu_ctx_mgr_init(&fpriv->ctx_mgr);
file_priv->driver_priv = fpriv;
- goto out_suspend;
-
-error_vm:
- amdgpu_vm_fini(adev, &fpriv->vm);
-
-error_pasid:
- if (pasid)
- amdgpu_pasid_free(pasid);
-
- kfree(fpriv);
out_suspend:
pm_runtime_mark_last_busy(dev->dev);
@@ -938,8 +931,6 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
struct amdgpu_fpriv *fpriv = file_priv->driver_priv;
struct amdgpu_bo_list *list;
struct amdgpu_sem *sem;
- struct amdgpu_bo *pd;
- unsigned int pasid;
int handle;
if (!fpriv)
@@ -964,13 +955,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
amdgpu_bo_unreserve(adev->virt.csa_obj);
}
- pasid = fpriv->vm.pasid;
- pd = amdgpu_bo_ref(fpriv->vm.root.base.bo);
-
amdgpu_vm_fini(adev, &fpriv->vm);
- if (pasid)
- amdgpu_pasid_free_delayed(pd->tbo.resv, pasid);
- amdgpu_bo_unref(&pd);
idr_for_each_entry(&fpriv->bo_list_handles, list, handle)
amdgpu_bo_list_free(list);
--
2.7.4
|