diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2015-05-11 16:20:58 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-06-03 21:03:57 -0400 |
| commit | 8dacc127fcb3b60e6893ec74ee2f615d78dcbc4e (patch) | |
| tree | a479e15c347b41b0556626b84c1309e2441af151 /drivers | |
| parent | b9a7faaeb2b0271ca9a7d8436a055da219a35ec8 (diff) | |
| download | linux-stable-8dacc127fcb3b60e6893ec74ee2f615d78dcbc4e.tar.gz linux-stable-8dacc127fcb3b60e6893ec74ee2f615d78dcbc4e.tar.bz2 linux-stable-8dacc127fcb3b60e6893ec74ee2f615d78dcbc4e.zip | |
drm/amdgpu: fix description of vm_size module parameter (v2)
default is 8GB, not 4GB.
v2: fix fallback setting when the user provides an invalid input
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index d9d26f2e7bd7..175dc67130c3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -968,13 +968,13 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) if (!amdgpu_check_pot_argument(amdgpu_vm_size)) { dev_warn(adev->dev, "VM size (%d) must be a power of 2\n", amdgpu_vm_size); - amdgpu_vm_size = 4; + amdgpu_vm_size = 8; } if (amdgpu_vm_size < 1) { dev_warn(adev->dev, "VM size (%d) too small, min is 1GB\n", amdgpu_vm_size); - amdgpu_vm_size = 4; + amdgpu_vm_size = 8; } /* @@ -983,7 +983,7 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) if (amdgpu_vm_size > 1024) { dev_warn(adev->dev, "VM size (%d) too large, max is 1TB\n", amdgpu_vm_size); - amdgpu_vm_size = 4; + amdgpu_vm_size = 8; } /* defines number of bits in page table versus page directory, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 6edacceb6cfd..56da962231fc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -128,7 +128,7 @@ module_param_named(bapm, amdgpu_bapm, int, 0444); MODULE_PARM_DESC(deep_color, "Deep Color support (1 = enable, 0 = disable (default))"); module_param_named(deep_color, amdgpu_deep_color, int, 0444); -MODULE_PARM_DESC(vm_size, "VM address space size in gigabytes (default 4GB)"); +MODULE_PARM_DESC(vm_size, "VM address space size in gigabytes (default 8GB)"); module_param_named(vm_size, amdgpu_vm_size, int, 0444); MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default depending on vm_size)"); |