diff options
author | Flora Cui <Flora.Cui@amd.com> | 2016-08-01 23:32:41 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-19 12:30:58 -0400 |
commit | c632d7994360aa06158ccb089ad7e4814ce8f08b (patch) | |
tree | 4275015c3a03e9356b30a2c1c6c44fca4fe98bea /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 2a702ccd9a79f6fc23fdb07a410a5f6533ac8f78 (diff) |
amdgpu: move ttm stuff to amdgpu_ttm.h
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 1a7e05da470e..06a7cab3bcc7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -51,6 +51,7 @@ | |||
51 | #include "amdgpu_ih.h" | 51 | #include "amdgpu_ih.h" |
52 | #include "amdgpu_irq.h" | 52 | #include "amdgpu_irq.h" |
53 | #include "amdgpu_ucode.h" | 53 | #include "amdgpu_ucode.h" |
54 | #include "amdgpu_ttm.h" | ||
54 | #include "amdgpu_gds.h" | 55 | #include "amdgpu_gds.h" |
55 | #include "amd_powerplay.h" | 56 | #include "amd_powerplay.h" |
56 | #include "amdgpu_acp.h" | 57 | #include "amdgpu_acp.h" |
@@ -397,51 +398,9 @@ int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); | |||
397 | unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); | 398 | unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); |
398 | 399 | ||
399 | /* | 400 | /* |
400 | * TTM. | 401 | * BO. |
401 | */ | 402 | */ |
402 | 403 | ||
403 | #define AMDGPU_TTM_LRU_SIZE 20 | ||
404 | |||
405 | struct amdgpu_mman_lru { | ||
406 | struct list_head *lru[TTM_NUM_MEM_TYPES]; | ||
407 | struct list_head *swap_lru; | ||
408 | }; | ||
409 | |||
410 | struct amdgpu_mman { | ||
411 | struct ttm_bo_global_ref bo_global_ref; | ||
412 | struct drm_global_reference mem_global_ref; | ||
413 | struct ttm_bo_device bdev; | ||
414 | bool mem_global_referenced; | ||
415 | bool initialized; | ||
416 | |||
417 | #if defined(CONFIG_DEBUG_FS) | ||
418 | struct dentry *vram; | ||
419 | struct dentry *gtt; | ||
420 | #endif | ||
421 | |||
422 | /* buffer handling */ | ||
423 | const struct amdgpu_buffer_funcs *buffer_funcs; | ||
424 | struct amdgpu_ring *buffer_funcs_ring; | ||
425 | /* Scheduler entity for buffer moves */ | ||
426 | struct amd_sched_entity entity; | ||
427 | |||
428 | /* custom LRU management */ | ||
429 | struct amdgpu_mman_lru log2_size[AMDGPU_TTM_LRU_SIZE]; | ||
430 | }; | ||
431 | |||
432 | int amdgpu_copy_buffer(struct amdgpu_ring *ring, | ||
433 | uint64_t src_offset, | ||
434 | uint64_t dst_offset, | ||
435 | uint32_t byte_count, | ||
436 | struct reservation_object *resv, | ||
437 | struct fence **fence); | ||
438 | int amdgpu_fill_buffer(struct amdgpu_bo *bo, | ||
439 | uint32_t src_data, | ||
440 | struct reservation_object *resv, | ||
441 | struct fence **fence); | ||
442 | |||
443 | int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma); | ||
444 | |||
445 | struct amdgpu_bo_list_entry { | 404 | struct amdgpu_bo_list_entry { |
446 | struct amdgpu_bo *robj; | 405 | struct amdgpu_bo *robj; |
447 | struct ttm_validate_buffer tv; | 406 | struct ttm_validate_buffer tv; |