blob: b4d8adb5d719e8299ff6db172c428e38e80e7a98 (
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
|
From 7a43aea5d575de132ce2d927159d145cb6997ea0 Mon Sep 17 00:00:00 2001
From: Chaudhary Amit Kumar <Chaudharyamit.Kumar@amd.com>
Date: Wed, 26 Jun 2019 15:32:58 +0530
Subject: [PATCH 2114/2940] Revert "drm/amdgpu: [hybrid] Restore scalable VM
size calculation"
This reverts commit 5f9d00a13825d2847191dbd4cf614340b431aece.
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 23 ----------------------
1 file changed, 23 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index b4faffb88434..82a66292f13f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -934,8 +934,6 @@ static void amdgpu_device_check_smu_prv_buffer_size(struct amdgpu_device *adev)
*/
static int amdgpu_device_check_arguments(struct amdgpu_device *adev)
{
- struct sysinfo si;
- int phys_ram_gb, amdgpu_vm_size_aligned;
int ret = 0;
if (amdgpu_sched_jobs < 4) {
@@ -962,27 +960,6 @@ static int 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.17.1
|
