blob: 652fb84d304f1a5b184a431f5d6024417742981d (
plain)
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
|
From d02621a5c25d78ced0d763bacec2f8846574511c Mon Sep 17 00:00:00 2001
From: ozeng <oak.zeng@amd.com>
Date: Thu, 6 Jul 2017 15:07:50 -0500
Subject: [PATCH 4140/5725] drm/amdgpu: Restore scalable VM size calculation
fa2f1a68af48de01c775585c552438aba795b2f5 made both the GART size
and VM size scalable to system memory size. This was reverted later
to solve SWDEV-123010. However the revert caused KFD huge buffer
test failure reported in SWDEV-126381. This restore the scalable
VM size calculation to allow KFD allocate huge buffer.
BUG: SWDEV-126381
Change-Id: I68cf765dfcb94921aae1a815ab896a367e3f3005
Signed-off-by: Oak Zeng <oak.zeng@amd.com>
Reviewed-by: Roger.He <Hongbo.He@amd.com>
Conflicts:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 968ec87..2bac39ee 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -982,6 +982,9 @@ static void amdgpu_device_check_smu_prv_buffer_size(struct amdgpu_device *adev)
*/
static void amdgpu_device_check_arguments(struct amdgpu_device *adev)
{
+ struct sysinfo si;
+ int phys_ram_gb, amdgpu_vm_size_aligned;
+
if (amdgpu_sched_jobs < 4) {
dev_warn(adev->dev, "sched jobs (%d) must be at least 4\n",
amdgpu_sched_jobs);
@@ -1006,6 +1009,27 @@ static void amdgpu_device_check_arguments(struct amdgpu_device *adev)
amdgpu_gtt_size = -1;
}
+ /* Compute the GPU VM space only if the user
+ * hasn't changed it from the default.
+ */
+ if (amdgpu_vm_size == -1) {
+ /* Computation depends on the amount of physical RAM available.
+ * Cannot exceed 1TB.
+ */
+ si_meminfo(&si);
+ phys_ram_gb = ((uint64_t)si.totalram * si.mem_unit) >> 30;
+ amdgpu_vm_size = min(phys_ram_gb * 3 + 16, 1024);
+
+ /* GPUVM sizes are almost never perfect powers of two.
+ * Round up to nearest power of two starting from
+ * the minimum allowed but aligned size of 32GB */
+ amdgpu_vm_size_aligned = 32;
+ while (amdgpu_vm_size > amdgpu_vm_size_aligned)
+ amdgpu_vm_size_aligned *= 2;
+
+ amdgpu_vm_size = amdgpu_vm_size_aligned;
+ }
+
/* valid range is between 4 and 9 inclusive */
if (amdgpu_vm_fragment_size != -1 &&
(amdgpu_vm_fragment_size > 9 || amdgpu_vm_fragment_size < 4)) {
--
2.7.4
|
