diff options
author | Christian König <christian.koenig@amd.com> | 2017-11-04 11:51:44 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-06 12:47:21 -0500 |
commit | fdd5faaa08f891153ac4fd8cedace6d95bed0968 (patch) | |
tree | b342a5442fab53bd1b44366d070932fca7e13f1d /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
parent | c47b41a79ab5e8faec9aea6c4a06c4d1e4d1132f (diff) |
drm/amdgpu: cleanup vm_size handling
It's pointless to have the same value twice, just always use max_pfn.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 1e727da2bb64..122379dfc7d8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |||
@@ -2576,27 +2576,27 @@ void amdgpu_vm_set_fragment_size(struct amdgpu_device *adev, | |||
2576 | * @adev: amdgpu_device pointer | 2576 | * @adev: amdgpu_device pointer |
2577 | * @vm_size: the default vm size if it's set auto | 2577 | * @vm_size: the default vm size if it's set auto |
2578 | */ | 2578 | */ |
2579 | void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint64_t vm_size, | 2579 | void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size, |
2580 | uint32_t fragment_size_default) | 2580 | uint32_t fragment_size_default) |
2581 | { | 2581 | { |
2582 | /* adjust vm size firstly */ | 2582 | /* adjust vm size firstly */ |
2583 | if (amdgpu_vm_size == -1) | 2583 | if (amdgpu_vm_size != -1) |
2584 | adev->vm_manager.vm_size = vm_size; | 2584 | vm_size = amdgpu_vm_size; |
2585 | else | 2585 | |
2586 | adev->vm_manager.vm_size = amdgpu_vm_size; | 2586 | adev->vm_manager.max_pfn = (uint64_t)vm_size << 18; |
2587 | 2587 | ||
2588 | /* block size depends on vm size */ | 2588 | /* block size depends on vm size */ |
2589 | if (amdgpu_vm_block_size == -1) | 2589 | if (amdgpu_vm_block_size == -1) |
2590 | adev->vm_manager.block_size = | 2590 | adev->vm_manager.block_size = |
2591 | amdgpu_vm_get_block_size(adev->vm_manager.vm_size); | 2591 | amdgpu_vm_get_block_size(vm_size); |
2592 | else | 2592 | else |
2593 | adev->vm_manager.block_size = amdgpu_vm_block_size; | 2593 | adev->vm_manager.block_size = amdgpu_vm_block_size; |
2594 | 2594 | ||
2595 | amdgpu_vm_set_fragment_size(adev, fragment_size_default); | 2595 | amdgpu_vm_set_fragment_size(adev, fragment_size_default); |
2596 | 2596 | ||
2597 | DRM_INFO("vm size is %llu GB, block size is %u-bit, fragment size is %u-bit\n", | 2597 | DRM_INFO("vm size is %u GB, block size is %u-bit, fragment size is %u-bit\n", |
2598 | adev->vm_manager.vm_size, adev->vm_manager.block_size, | 2598 | vm_size, adev->vm_manager.block_size, |
2599 | adev->vm_manager.fragment_size); | 2599 | adev->vm_manager.fragment_size); |
2600 | } | 2600 | } |
2601 | 2601 | ||
2602 | /** | 2602 | /** |