diff options
author | Christian König <christian.koenig@amd.com> | 2018-03-01 04:41:46 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-03-05 15:37:05 -0500 |
commit | c396ef9bf3172fd57e86df4529b11d563f9ff801 (patch) | |
tree | c74b5da67cae4256d1ffed2c26b7dc3ba04e0657 | |
parent | ea74e15fb547483f9f86088443f2d3c9f518de8b (diff) |
drm/amdgpu: move some functions into amdgpu_ttm.h
Those belong to the TTM handling.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 86fbc8649af0..eba4abc8aac6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1827,9 +1827,6 @@ void amdgpu_device_vram_location(struct amdgpu_device *adev, | |||
1827 | void amdgpu_device_gart_location(struct amdgpu_device *adev, | 1827 | void amdgpu_device_gart_location(struct amdgpu_device *adev, |
1828 | struct amdgpu_gmc *mc); | 1828 | struct amdgpu_gmc *mc); |
1829 | int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev); | 1829 | int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev); |
1830 | void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size); | ||
1831 | int amdgpu_ttm_init(struct amdgpu_device *adev); | ||
1832 | void amdgpu_ttm_fini(struct amdgpu_device *adev); | ||
1833 | void amdgpu_device_program_register_sequence(struct amdgpu_device *adev, | 1830 | void amdgpu_device_program_register_sequence(struct amdgpu_device *adev, |
1834 | const u32 *registers, | 1831 | const u32 *registers, |
1835 | const u32 array_size); | 1832 | const u32 array_size); |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h index d31491069f2f..0fba23c69e97 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | |||
@@ -75,6 +75,10 @@ int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man); | |||
75 | uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); | 75 | uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); |
76 | uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man); | 76 | uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man); |
77 | 77 | ||
78 | int amdgpu_ttm_init(struct amdgpu_device *adev); | ||
79 | void amdgpu_ttm_fini(struct amdgpu_device *adev); | ||
80 | void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size); | ||
81 | |||
78 | int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, | 82 | int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, |
79 | uint64_t dst_offset, uint32_t byte_count, | 83 | uint64_t dst_offset, uint32_t byte_count, |
80 | struct reservation_object *resv, | 84 | struct reservation_object *resv, |