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.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 3d4c2abfcfe8..081953e1ec6c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -814,7 +814,6 @@ struct amdgpu_ring {
814 struct amd_gpu_scheduler sched; 814 struct amd_gpu_scheduler sched;
815 815
816 spinlock_t fence_lock; 816 spinlock_t fence_lock;
817 struct mutex *ring_lock;
818 struct amdgpu_bo *ring_obj; 817 struct amdgpu_bo *ring_obj;
819 volatile uint32_t *ring; 818 volatile uint32_t *ring;
820 unsigned rptr_offs; 819 unsigned rptr_offs;
@@ -1190,12 +1189,9 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev);
1190/* Ring access between begin & end cannot sleep */ 1189/* Ring access between begin & end cannot sleep */
1191void amdgpu_ring_free_size(struct amdgpu_ring *ring); 1190void amdgpu_ring_free_size(struct amdgpu_ring *ring);
1192int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw); 1191int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw);
1193int amdgpu_ring_lock(struct amdgpu_ring *ring, unsigned ndw);
1194void amdgpu_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count); 1192void amdgpu_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count);
1195void amdgpu_ring_commit(struct amdgpu_ring *ring); 1193void amdgpu_ring_commit(struct amdgpu_ring *ring);
1196void amdgpu_ring_unlock_commit(struct amdgpu_ring *ring);
1197void amdgpu_ring_undo(struct amdgpu_ring *ring); 1194void amdgpu_ring_undo(struct amdgpu_ring *ring);
1198void amdgpu_ring_unlock_undo(struct amdgpu_ring *ring);
1199unsigned amdgpu_ring_backup(struct amdgpu_ring *ring, 1195unsigned amdgpu_ring_backup(struct amdgpu_ring *ring,
1200 uint32_t **data); 1196 uint32_t **data);
1201int amdgpu_ring_restore(struct amdgpu_ring *ring, 1197int amdgpu_ring_restore(struct amdgpu_ring *ring,
@@ -2009,7 +2005,6 @@ struct amdgpu_device {
2009 2005
2010 /* rings */ 2006 /* rings */
2011 unsigned fence_context; 2007 unsigned fence_context;
2012 struct mutex ring_lock;
2013 unsigned num_rings; 2008 unsigned num_rings;
2014 struct amdgpu_ring *rings[AMDGPU_MAX_RINGS]; 2009 struct amdgpu_ring *rings[AMDGPU_MAX_RINGS];
2015 bool ib_pool_ready; 2010 bool ib_pool_ready;