diff options
author | Christian König <christian.koenig@amd.com> | 2017-07-07 05:56:59 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-07-14 11:06:30 -0400 |
commit | 6f02a69648f14024213ab65cd4a4a701e40e46ff (patch) | |
tree | aad624558954a5dc6344619b42e68acdca82e8f1 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
parent | ed21c047e9753ed5c7abe437ec25222b7d538a89 (diff) |
drm/amdgpu: consistent name all GART related parts
Rename symbols from gtt_ to gart_ as appropriate.
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_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index fb9c6988f5f2..4e711d9af67c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -158,7 +158,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, | |||
158 | break; | 158 | break; |
159 | case TTM_PL_TT: | 159 | case TTM_PL_TT: |
160 | man->func = &amdgpu_gtt_mgr_func; | 160 | man->func = &amdgpu_gtt_mgr_func; |
161 | man->gpu_offset = adev->mc.gtt_start; | 161 | man->gpu_offset = adev->mc.gart_start; |
162 | man->available_caching = TTM_PL_MASK_CACHING; | 162 | man->available_caching = TTM_PL_MASK_CACHING; |
163 | man->default_caching = TTM_PL_FLAG_CACHED; | 163 | man->default_caching = TTM_PL_FLAG_CACHED; |
164 | man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; | 164 | man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; |
@@ -1144,13 +1144,13 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) | |||
1144 | DRM_INFO("amdgpu: %uM of VRAM memory ready\n", | 1144 | DRM_INFO("amdgpu: %uM of VRAM memory ready\n", |
1145 | (unsigned) (adev->mc.real_vram_size / (1024 * 1024))); | 1145 | (unsigned) (adev->mc.real_vram_size / (1024 * 1024))); |
1146 | r = ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT, | 1146 | r = ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT, |
1147 | adev->mc.gtt_size >> PAGE_SHIFT); | 1147 | adev->mc.gart_size >> PAGE_SHIFT); |
1148 | if (r) { | 1148 | if (r) { |
1149 | DRM_ERROR("Failed initializing GTT heap.\n"); | 1149 | DRM_ERROR("Failed initializing GTT heap.\n"); |
1150 | return r; | 1150 | return r; |
1151 | } | 1151 | } |
1152 | DRM_INFO("amdgpu: %uM of GTT memory ready.\n", | 1152 | DRM_INFO("amdgpu: %uM of GTT memory ready.\n", |
1153 | (unsigned)(adev->mc.gtt_size / (1024 * 1024))); | 1153 | (unsigned)(adev->mc.gart_size / (1024 * 1024))); |
1154 | 1154 | ||
1155 | adev->gds.mem.total_size = adev->gds.mem.total_size << AMDGPU_GDS_SHIFT; | 1155 | adev->gds.mem.total_size = adev->gds.mem.total_size << AMDGPU_GDS_SHIFT; |
1156 | adev->gds.mem.gfx_partition_size = adev->gds.mem.gfx_partition_size << AMDGPU_GDS_SHIFT; | 1156 | adev->gds.mem.gfx_partition_size = adev->gds.mem.gfx_partition_size << AMDGPU_GDS_SHIFT; |
@@ -1279,7 +1279,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, | |||
1279 | BUG_ON(adev->mman.buffer_funcs->copy_max_bytes < | 1279 | BUG_ON(adev->mman.buffer_funcs->copy_max_bytes < |
1280 | AMDGPU_GTT_MAX_TRANSFER_SIZE * 8); | 1280 | AMDGPU_GTT_MAX_TRANSFER_SIZE * 8); |
1281 | 1281 | ||
1282 | *addr = adev->mc.gtt_start; | 1282 | *addr = adev->mc.gart_start; |
1283 | *addr += (u64)window * AMDGPU_GTT_MAX_TRANSFER_SIZE * | 1283 | *addr += (u64)window * AMDGPU_GTT_MAX_TRANSFER_SIZE * |
1284 | AMDGPU_GPU_PAGE_SIZE; | 1284 | AMDGPU_GPU_PAGE_SIZE; |
1285 | 1285 | ||
@@ -1645,7 +1645,7 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev) | |||
1645 | adev, &amdgpu_ttm_gtt_fops); | 1645 | adev, &amdgpu_ttm_gtt_fops); |
1646 | if (IS_ERR(ent)) | 1646 | if (IS_ERR(ent)) |
1647 | return PTR_ERR(ent); | 1647 | return PTR_ERR(ent); |
1648 | i_size_write(ent->d_inode, adev->mc.gtt_size); | 1648 | i_size_write(ent->d_inode, adev->mc.gart_size); |
1649 | adev->mman.gtt = ent; | 1649 | adev->mman.gtt = ent; |
1650 | 1650 | ||
1651 | #endif | 1651 | #endif |