From 8dacc127fcb3b60e6893ec74ee2f615d78dcbc4e Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 11 May 2015 16:20:58 -0400 Subject: [PATCH 0233/1050] 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 --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 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 d9d26f2..175dc67 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 6edacce..56da962 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)"); -- 1.9.1