diff options
author | Christian König <deathsimple@vodafone.de> | 2011-10-23 06:56:27 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:50:56 -0500 |
commit | e32eb50dbe43862606a51caa94368ec6bd019434 (patch) | |
tree | a064cf4e60c0d42694e5dcc3759794b4b24b8e77 /drivers/gpu/drm/radeon/r420.c | |
parent | d6d2730c71a5d41a121a7b567bf7ff9c5d4cd3ab (diff) |
drm/radeon: rename struct radeon_cp to radeon_ring
That naming seems to make more sense, since we not
only want to run PM4 rings with it.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r420.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index 62e86043699..1d3231f3a09 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
@@ -199,7 +199,7 @@ static void r420_clock_resume(struct radeon_device *rdev) | |||
199 | 199 | ||
200 | static void r420_cp_errata_init(struct radeon_device *rdev) | 200 | static void r420_cp_errata_init(struct radeon_device *rdev) |
201 | { | 201 | { |
202 | struct radeon_cp *cp = &rdev->cp[RADEON_RING_TYPE_GFX_INDEX]; | 202 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; |
203 | 203 | ||
204 | /* RV410 and R420 can lock up if CP DMA to host memory happens | 204 | /* RV410 and R420 can lock up if CP DMA to host memory happens |
205 | * while the 2D engine is busy. | 205 | * while the 2D engine is busy. |
@@ -208,24 +208,24 @@ static void r420_cp_errata_init(struct radeon_device *rdev) | |||
208 | * of the CP init, apparently. | 208 | * of the CP init, apparently. |
209 | */ | 209 | */ |
210 | radeon_scratch_get(rdev, &rdev->config.r300.resync_scratch); | 210 | radeon_scratch_get(rdev, &rdev->config.r300.resync_scratch); |
211 | radeon_ring_lock(rdev, cp, 8); | 211 | radeon_ring_lock(rdev, ring, 8); |
212 | radeon_ring_write(cp, PACKET0(R300_CP_RESYNC_ADDR, 1)); | 212 | radeon_ring_write(ring, PACKET0(R300_CP_RESYNC_ADDR, 1)); |
213 | radeon_ring_write(cp, rdev->config.r300.resync_scratch); | 213 | radeon_ring_write(ring, rdev->config.r300.resync_scratch); |
214 | radeon_ring_write(cp, 0xDEADBEEF); | 214 | radeon_ring_write(ring, 0xDEADBEEF); |
215 | radeon_ring_unlock_commit(rdev, cp); | 215 | radeon_ring_unlock_commit(rdev, ring); |
216 | } | 216 | } |
217 | 217 | ||
218 | static void r420_cp_errata_fini(struct radeon_device *rdev) | 218 | static void r420_cp_errata_fini(struct radeon_device *rdev) |
219 | { | 219 | { |
220 | struct radeon_cp *cp = &rdev->cp[RADEON_RING_TYPE_GFX_INDEX]; | 220 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; |
221 | 221 | ||
222 | /* Catch the RESYNC we dispatched all the way back, | 222 | /* Catch the RESYNC we dispatched all the way back, |
223 | * at the very beginning of the CP init. | 223 | * at the very beginning of the CP init. |
224 | */ | 224 | */ |
225 | radeon_ring_lock(rdev, cp, 8); | 225 | radeon_ring_lock(rdev, ring, 8); |
226 | radeon_ring_write(cp, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | 226 | radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); |
227 | radeon_ring_write(cp, R300_RB3D_DC_FINISH); | 227 | radeon_ring_write(ring, R300_RB3D_DC_FINISH); |
228 | radeon_ring_unlock_commit(rdev, cp); | 228 | radeon_ring_unlock_commit(rdev, ring); |
229 | radeon_scratch_free(rdev, rdev->config.r300.resync_scratch); | 229 | radeon_scratch_free(rdev, rdev->config.r300.resync_scratch); |
230 | } | 230 | } |
231 | 231 | ||