diff options
| author |   Christian König <christian.koenig@amd.com> | 2013-08-13 11:56:52 +0200 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2013-08-30 16:30:41 -0400 |
| commit | 2e1e6dad6a6d437e4c40611fdcc4e6cd9e2f969e (patch) | |
| tree | 325bb0cb184b6a39211403124336f4e18b0728d4 /drivers/gpu/drm/radeon/radeon.h | |
| parent | drm/radeon: rework UVD writeback & [rw]ptr handling (diff) | |
| download | linux-dev-2e1e6dad6a6d437e4c40611fdcc4e6cd9e2f969e.tar.xz linux-dev-2e1e6dad6a6d437e4c40611fdcc4e6cd9e2f969e.zip | |
drm/radeon: remove special handling for the DMA ring
Now that we have callbacks for [rw]ptr handling we can
remove the special handling for the DMA rings and use
the callbacks instead.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 2eab174bf22e..791cc8de6395 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -760,8 +760,6 @@ struct radeon_ring { uint32_t align_mask; uint32_t ptr_mask; bool ready; - u32 ptr_reg_shift; - u32 ptr_reg_mask; u32 nop; u32 idx; u64 last_semaphore_signal_addr; @@ -912,8 +910,7 @@ unsigned radeon_ring_backup(struct radeon_device *rdev, struct radeon_ring *ring int radeon_ring_restore(struct radeon_device *rdev, struct radeon_ring *ring, unsigned size, uint32_t *data); int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ring_size, - unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg, - u32 ptr_reg_shift, u32 ptr_reg_mask, u32 nop); + unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg, u32 nop); void radeon_ring_fini(struct radeon_device *rdev, struct radeon_ring *cp); |