aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-11-23 06:57:18 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-12-06 12:48:30 -0500
commitf3368128bacece315aa0384b54b7da9e6f0909cd (patch)
tree7b2654fc54b4847362c5b3281bb7512f155fe73f /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parent341b759e642a847c3a88401db4263dec9f36d552 (diff)
drm/amdgpu: move validation of the VM size into the VM code
This moves validation of the VM size parameter into amdgpu_vm_adjust_size(). Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 748ecd74726d..cd74beb431c4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1187,22 +1187,8 @@ static void amdgpu_check_vm_size(struct amdgpu_device *adev)
1187 if (amdgpu_vm_size < 1) { 1187 if (amdgpu_vm_size < 1) {
1188 dev_warn(adev->dev, "VM size (%d) too small, min is 1GB\n", 1188 dev_warn(adev->dev, "VM size (%d) too small, min is 1GB\n",
1189 amdgpu_vm_size); 1189 amdgpu_vm_size);
1190 goto def_value; 1190 amdgpu_vm_size = -1;
1191 } 1191 }
1192
1193 /*
1194 * Max GPUVM size for Cayman, SI, CI VI are 40 bits.
1195 */
1196 if (amdgpu_vm_size > 1024) {
1197 dev_warn(adev->dev, "VM size (%d) too large, max is 1TB\n",
1198 amdgpu_vm_size);
1199 goto def_value;
1200 }
1201
1202 return;
1203
1204def_value:
1205 amdgpu_vm_size = -1;
1206} 1192}
1207 1193
1208/** 1194/**