aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-08-27 12:22:31 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-09-10 23:41:24 -0400
commitad9a5b78f585e9a9bd5ad06dfaf1269659a99f43 (patch)
tree3353b464a93fb9c6a0531a77815f3f838ae4b7f5 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
parentbcdc9fd634d1f0949774690e9e79ffdfc5d094c8 (diff)
drm/amdgpu: correctly sign extend 48bit addresses v3
Correct sign extend the GMC addresses to 48bit. v2: sign extending turned out easier than thought. v3: clean up the defines and move them into amdgpu_gmc.h as well Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index ad7978bab5fc..86e8772b6852 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -655,11 +655,11 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
655 655
656 dev_info.virtual_address_offset = AMDGPU_VA_RESERVED_SIZE; 656 dev_info.virtual_address_offset = AMDGPU_VA_RESERVED_SIZE;
657 dev_info.virtual_address_max = 657 dev_info.virtual_address_max =
658 min(vm_size, AMDGPU_VA_HOLE_START); 658 min(vm_size, AMDGPU_GMC_HOLE_START);
659 659
660 if (vm_size > AMDGPU_VA_HOLE_START) { 660 if (vm_size > AMDGPU_GMC_HOLE_START) {
661 dev_info.high_va_offset = AMDGPU_VA_HOLE_END; 661 dev_info.high_va_offset = AMDGPU_GMC_HOLE_END;
662 dev_info.high_va_max = AMDGPU_VA_HOLE_END | vm_size; 662 dev_info.high_va_max = AMDGPU_GMC_HOLE_END | vm_size;
663 } 663 }
664 dev_info.virtual_address_alignment = max((int)PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE); 664 dev_info.virtual_address_alignment = max((int)PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE);
665 dev_info.pte_fragment_size = (1 << adev->vm_manager.fragment_size) * AMDGPU_GPU_PAGE_SIZE; 665 dev_info.pte_fragment_size = (1 << adev->vm_manager.fragment_size) * AMDGPU_GPU_PAGE_SIZE;