diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 82ffa6a05cc6..e99ea816d8c9 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -676,7 +676,6 @@ struct radeon_ring { | |||
676 | uint64_t gpu_addr; | 676 | uint64_t gpu_addr; |
677 | uint32_t align_mask; | 677 | uint32_t align_mask; |
678 | uint32_t ptr_mask; | 678 | uint32_t ptr_mask; |
679 | struct mutex mutex; | ||
680 | bool ready; | 679 | bool ready; |
681 | u32 ptr_reg_shift; | 680 | u32 ptr_reg_shift; |
682 | u32 ptr_reg_mask; | 681 | u32 ptr_reg_mask; |
@@ -815,6 +814,7 @@ int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *cp, unsign | |||
815 | int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw); | 814 | int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw); |
816 | void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *cp); | 815 | void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *cp); |
817 | void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *cp); | 816 | void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *cp); |
817 | void radeon_ring_undo(struct radeon_ring *ring); | ||
818 | void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp); | 818 | void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp); |
819 | int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp); | 819 | int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp); |
820 | void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring *ring); | 820 | void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring *ring); |
@@ -1534,6 +1534,7 @@ struct radeon_device { | |||
1534 | rwlock_t fence_lock; | 1534 | rwlock_t fence_lock; |
1535 | struct radeon_fence_driver fence_drv[RADEON_NUM_RINGS]; | 1535 | struct radeon_fence_driver fence_drv[RADEON_NUM_RINGS]; |
1536 | struct radeon_semaphore_driver semaphore_drv; | 1536 | struct radeon_semaphore_driver semaphore_drv; |
1537 | struct mutex ring_lock; | ||
1537 | struct radeon_ring ring[RADEON_NUM_RINGS]; | 1538 | struct radeon_ring ring[RADEON_NUM_RINGS]; |
1538 | struct radeon_ib_pool ib_pool; | 1539 | struct radeon_ib_pool ib_pool; |
1539 | struct radeon_irq irq; | 1540 | struct radeon_irq irq; |