diff options
author | Christian König <christian.koenig@amd.com> | 2017-06-30 08:37:02 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-07-14 11:06:23 -0400 |
commit | 09628c3f68c6ec63c8eba324eb7fd70d46bf3eb2 (patch) | |
tree | a4971a0584a03322230d779ebf0fc4dc6c773d1f /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
parent | 935eefb312566364ef395eb29574e093686dbec8 (diff) |
drm/amdgpu: use TTM values instead of MC values for the info queries
Use the TTM values instead of the hardware config here.
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_kms.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index b0b23101d1c8..63017de99f36 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |||
@@ -485,7 +485,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
485 | vram_gtt.vram_size -= adev->vram_pin_size; | 485 | vram_gtt.vram_size -= adev->vram_pin_size; |
486 | vram_gtt.vram_cpu_accessible_size = adev->mc.visible_vram_size; | 486 | vram_gtt.vram_cpu_accessible_size = adev->mc.visible_vram_size; |
487 | vram_gtt.vram_cpu_accessible_size -= (adev->vram_pin_size - adev->invisible_pin_size); | 487 | vram_gtt.vram_cpu_accessible_size -= (adev->vram_pin_size - adev->invisible_pin_size); |
488 | vram_gtt.gtt_size = adev->mc.gtt_size; | 488 | vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size; |
489 | vram_gtt.gtt_size *= PAGE_SIZE; | ||
489 | vram_gtt.gtt_size -= adev->gart_pin_size; | 490 | vram_gtt.gtt_size -= adev->gart_pin_size; |
490 | return copy_to_user(out, &vram_gtt, | 491 | return copy_to_user(out, &vram_gtt, |
491 | min((size_t)size, sizeof(vram_gtt))) ? -EFAULT : 0; | 492 | min((size_t)size, sizeof(vram_gtt))) ? -EFAULT : 0; |
@@ -510,9 +511,10 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
510 | mem.cpu_accessible_vram.max_allocation = | 511 | mem.cpu_accessible_vram.max_allocation = |
511 | mem.cpu_accessible_vram.usable_heap_size * 3 / 4; | 512 | mem.cpu_accessible_vram.usable_heap_size * 3 / 4; |
512 | 513 | ||
513 | mem.gtt.total_heap_size = adev->mc.gtt_size; | 514 | mem.gtt.total_heap_size = adev->mman.bdev.man[TTM_PL_TT].size; |
514 | mem.gtt.usable_heap_size = | 515 | mem.gtt.total_heap_size *= PAGE_SIZE; |
515 | adev->mc.gtt_size - adev->gart_pin_size; | 516 | mem.gtt.usable_heap_size = mem.gtt.total_heap_size |
517 | - adev->gart_pin_size; | ||
516 | mem.gtt.heap_usage = atomic64_read(&adev->gtt_usage); | 518 | mem.gtt.heap_usage = atomic64_read(&adev->gtt_usage); |
517 | mem.gtt.max_allocation = mem.gtt.usable_heap_size * 3 / 4; | 519 | mem.gtt.max_allocation = mem.gtt.usable_heap_size * 3 / 4; |
518 | 520 | ||