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, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 081953e1ec6c..41c725e02f39 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -822,7 +822,7 @@ struct amdgpu_ring {
822 unsigned wptr; 822 unsigned wptr;
823 unsigned wptr_old; 823 unsigned wptr_old;
824 unsigned ring_size; 824 unsigned ring_size;
825 unsigned ring_free_dw; 825 unsigned max_dw;
826 int count_dw; 826 int count_dw;
827 uint64_t gpu_addr; 827 uint64_t gpu_addr;
828 uint32_t align_mask; 828 uint32_t align_mask;
@@ -1186,8 +1186,6 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
1186int amdgpu_ib_pool_init(struct amdgpu_device *adev); 1186int amdgpu_ib_pool_init(struct amdgpu_device *adev);
1187void amdgpu_ib_pool_fini(struct amdgpu_device *adev); 1187void amdgpu_ib_pool_fini(struct amdgpu_device *adev);
1188int amdgpu_ib_ring_tests(struct amdgpu_device *adev); 1188int amdgpu_ib_ring_tests(struct amdgpu_device *adev);
1189/* Ring access between begin & end cannot sleep */
1190void amdgpu_ring_free_size(struct amdgpu_ring *ring);
1191int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw); 1189int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw);
1192void amdgpu_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count); 1190void amdgpu_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count);
1193void amdgpu_ring_commit(struct amdgpu_ring *ring); 1191void amdgpu_ring_commit(struct amdgpu_ring *ring);
@@ -2163,7 +2161,6 @@ static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v)
2163 ring->ring[ring->wptr++] = v; 2161 ring->ring[ring->wptr++] = v;
2164 ring->wptr &= ring->ptr_mask; 2162 ring->wptr &= ring->ptr_mask;
2165 ring->count_dw--; 2163 ring->count_dw--;
2166 ring->ring_free_dw--;
2167} 2164}
2168 2165
2169static inline struct amdgpu_sdma_instance * 2166static inline struct amdgpu_sdma_instance *