diff options
author | Christian König <christian.koenig@amd.com> | 2014-02-18 08:52:33 -0500 |
---|---|---|
committer | Christian König <christian.koenig@amd.com> | 2014-02-18 11:49:19 -0500 |
commit | ff212f25feb44a915ce9c0144faef7fae27a6e61 (patch) | |
tree | 4cfdebae7d47c5504d087ef8950e068a426f1270 /drivers/gpu/drm/radeon/radeon.h | |
parent | a1d6f97c8cfa7c3554d0391c0b16505d1d97f380 (diff) |
drm/radeon: drop drivers copy of the rptr
In all cases where it really matters we are using the read functions anyway.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 540624e7491c..e1c4f9c6772b 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -793,7 +793,6 @@ struct radeon_ib { | |||
793 | struct radeon_ring { | 793 | struct radeon_ring { |
794 | struct radeon_bo *ring_obj; | 794 | struct radeon_bo *ring_obj; |
795 | volatile uint32_t *ring; | 795 | volatile uint32_t *ring; |
796 | unsigned rptr; | ||
797 | unsigned rptr_offs; | 796 | unsigned rptr_offs; |
798 | unsigned rptr_save_reg; | 797 | unsigned rptr_save_reg; |
799 | u64 next_rptr_gpu_addr; | 798 | u64 next_rptr_gpu_addr; |
@@ -958,7 +957,8 @@ void radeon_ring_undo(struct radeon_ring *ring); | |||
958 | void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp); | 957 | void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp); |
959 | int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp); | 958 | int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp); |
960 | void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring *ring); | 959 | void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring *ring); |
961 | void radeon_ring_lockup_update(struct radeon_ring *ring); | 960 | void radeon_ring_lockup_update(struct radeon_device *rdev, |
961 | struct radeon_ring *ring); | ||
962 | bool radeon_ring_test_lockup(struct radeon_device *rdev, struct radeon_ring *ring); | 962 | bool radeon_ring_test_lockup(struct radeon_device *rdev, struct radeon_ring *ring); |
963 | unsigned radeon_ring_backup(struct radeon_device *rdev, struct radeon_ring *ring, | 963 | unsigned radeon_ring_backup(struct radeon_device *rdev, struct radeon_ring *ring, |
964 | uint32_t **data); | 964 | uint32_t **data); |