diff options
author | Christian König <deathsimple@vodafone.de> | 2012-05-02 09:11:23 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 04:16:38 -0400 |
commit | 7b9ef16bd187b7e7f43887afb393d1f89e5bee71 (patch) | |
tree | f36f2bcd3207f49361ffdf10ed7a630580da788d /drivers/gpu/drm/radeon/r600.c | |
parent | 67e3c7876878264a81afe0dceb8ac653af8387be (diff) |
drm/radeon: make forcing ring activity a common function
Nothing chipset or ring specific with it,
so also move it to radon_ring.
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/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 45d52ccc457..87a2333c0c6 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -1350,7 +1350,6 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) | |||
1350 | u32 srbm_status; | 1350 | u32 srbm_status; |
1351 | u32 grbm_status; | 1351 | u32 grbm_status; |
1352 | u32 grbm_status2; | 1352 | u32 grbm_status2; |
1353 | int r; | ||
1354 | 1353 | ||
1355 | srbm_status = RREG32(R_000E50_SRBM_STATUS); | 1354 | srbm_status = RREG32(R_000E50_SRBM_STATUS); |
1356 | grbm_status = RREG32(R_008010_GRBM_STATUS); | 1355 | grbm_status = RREG32(R_008010_GRBM_STATUS); |
@@ -1360,14 +1359,7 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) | |||
1360 | return false; | 1359 | return false; |
1361 | } | 1360 | } |
1362 | /* force CP activities */ | 1361 | /* force CP activities */ |
1363 | r = radeon_ring_lock(rdev, ring, 2); | 1362 | radeon_ring_force_activity(rdev, ring); |
1364 | if (!r) { | ||
1365 | /* PACKET2 NOP */ | ||
1366 | radeon_ring_write(ring, 0x80000000); | ||
1367 | radeon_ring_write(ring, 0x80000000); | ||
1368 | radeon_ring_unlock_commit(rdev, ring); | ||
1369 | } | ||
1370 | ring->rptr = RREG32(ring->rptr_reg); | ||
1371 | return radeon_ring_test_lockup(rdev, ring); | 1363 | return radeon_ring_test_lockup(rdev, ring); |
1372 | } | 1364 | } |
1373 | 1365 | ||