aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 922a20c972b1..c13023dded8f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -597,10 +597,8 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
597 struct amdgpu_sync *sync, 597 struct amdgpu_sync *sync,
598 struct reservation_object *resv, 598 struct reservation_object *resv,
599 void *owner); 599 void *owner);
600bool amdgpu_sync_is_idle(struct amdgpu_sync *sync, 600struct fence *amdgpu_sync_peek_fence(struct amdgpu_sync *sync,
601 struct amdgpu_ring *ring); 601 struct amdgpu_ring *ring);
602int amdgpu_sync_cycle_fences(struct amdgpu_sync *dst, struct amdgpu_sync *src,
603 struct fence *fence);
604struct fence *amdgpu_sync_get_fence(struct amdgpu_sync *sync); 602struct fence *amdgpu_sync_get_fence(struct amdgpu_sync *sync);
605void amdgpu_sync_free(struct amdgpu_sync *sync); 603void amdgpu_sync_free(struct amdgpu_sync *sync);
606int amdgpu_sync_init(void); 604int amdgpu_sync_init(void);
@@ -909,6 +907,10 @@ struct amdgpu_vm_manager {
909 struct list_head ids_lru; 907 struct list_head ids_lru;
910 struct amdgpu_vm_id ids[AMDGPU_NUM_VM]; 908 struct amdgpu_vm_id ids[AMDGPU_NUM_VM];
911 909
910 /* Handling of VM fences */
911 u64 fence_context;
912 unsigned seqno[AMDGPU_MAX_RINGS];
913
912 uint32_t max_pfn; 914 uint32_t max_pfn;
913 /* vram base address for page table entry */ 915 /* vram base address for page table entry */
914 u64 vram_base_offset; 916 u64 vram_base_offset;