diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index bd6e9a40f421..2b077ccec181 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |||
@@ -191,7 +191,7 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info, | |||
191 | fw_info->feature = 0; | 191 | fw_info->feature = 0; |
192 | break; | 192 | break; |
193 | case AMDGPU_INFO_FW_GMC: | 193 | case AMDGPU_INFO_FW_GMC: |
194 | fw_info->ver = adev->mc.fw_version; | 194 | fw_info->ver = adev->gmc.fw_version; |
195 | fw_info->feature = 0; | 195 | fw_info->feature = 0; |
196 | break; | 196 | break; |
197 | case AMDGPU_INFO_FW_GFX_ME: | 197 | case AMDGPU_INFO_FW_GFX_ME: |
@@ -470,9 +470,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
470 | case AMDGPU_INFO_VRAM_GTT: { | 470 | case AMDGPU_INFO_VRAM_GTT: { |
471 | struct drm_amdgpu_info_vram_gtt vram_gtt; | 471 | struct drm_amdgpu_info_vram_gtt vram_gtt; |
472 | 472 | ||
473 | vram_gtt.vram_size = adev->mc.real_vram_size; | 473 | vram_gtt.vram_size = adev->gmc.real_vram_size; |
474 | vram_gtt.vram_size -= adev->vram_pin_size; | 474 | vram_gtt.vram_size -= adev->vram_pin_size; |
475 | vram_gtt.vram_cpu_accessible_size = adev->mc.visible_vram_size; | 475 | vram_gtt.vram_cpu_accessible_size = adev->gmc.visible_vram_size; |
476 | vram_gtt.vram_cpu_accessible_size -= (adev->vram_pin_size - adev->invisible_pin_size); | 476 | vram_gtt.vram_cpu_accessible_size -= (adev->vram_pin_size - adev->invisible_pin_size); |
477 | vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size; | 477 | vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size; |
478 | vram_gtt.gtt_size *= PAGE_SIZE; | 478 | vram_gtt.gtt_size *= PAGE_SIZE; |
@@ -484,17 +484,17 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
484 | struct drm_amdgpu_memory_info mem; | 484 | struct drm_amdgpu_memory_info mem; |
485 | 485 | ||
486 | memset(&mem, 0, sizeof(mem)); | 486 | memset(&mem, 0, sizeof(mem)); |
487 | mem.vram.total_heap_size = adev->mc.real_vram_size; | 487 | mem.vram.total_heap_size = adev->gmc.real_vram_size; |
488 | mem.vram.usable_heap_size = | 488 | mem.vram.usable_heap_size = |
489 | adev->mc.real_vram_size - adev->vram_pin_size; | 489 | adev->gmc.real_vram_size - adev->vram_pin_size; |
490 | mem.vram.heap_usage = | 490 | mem.vram.heap_usage = |
491 | amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]); | 491 | amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]); |
492 | mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4; | 492 | mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4; |
493 | 493 | ||
494 | mem.cpu_accessible_vram.total_heap_size = | 494 | mem.cpu_accessible_vram.total_heap_size = |
495 | adev->mc.visible_vram_size; | 495 | adev->gmc.visible_vram_size; |
496 | mem.cpu_accessible_vram.usable_heap_size = | 496 | mem.cpu_accessible_vram.usable_heap_size = |
497 | adev->mc.visible_vram_size - | 497 | adev->gmc.visible_vram_size - |
498 | (adev->vram_pin_size - adev->invisible_pin_size); | 498 | (adev->vram_pin_size - adev->invisible_pin_size); |
499 | mem.cpu_accessible_vram.heap_usage = | 499 | mem.cpu_accessible_vram.heap_usage = |
500 | amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]); | 500 | amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]); |
@@ -599,8 +599,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
599 | sizeof(adev->gfx.cu_info.ao_cu_bitmap)); | 599 | sizeof(adev->gfx.cu_info.ao_cu_bitmap)); |
600 | memcpy(&dev_info.cu_bitmap[0], &adev->gfx.cu_info.bitmap[0], | 600 | memcpy(&dev_info.cu_bitmap[0], &adev->gfx.cu_info.bitmap[0], |
601 | sizeof(adev->gfx.cu_info.bitmap)); | 601 | sizeof(adev->gfx.cu_info.bitmap)); |
602 | dev_info.vram_type = adev->mc.vram_type; | 602 | dev_info.vram_type = adev->gmc.vram_type; |
603 | dev_info.vram_bit_width = adev->mc.vram_width; | 603 | dev_info.vram_bit_width = adev->gmc.vram_width; |
604 | dev_info.vce_harvest_config = adev->vce.harvest_config; | 604 | dev_info.vce_harvest_config = adev->vce.harvest_config; |
605 | dev_info.gc_double_offchip_lds_buf = | 605 | dev_info.gc_double_offchip_lds_buf = |
606 | adev->gfx.config.double_offchip_lds_buf; | 606 | adev->gfx.config.double_offchip_lds_buf; |