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>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index ccf5e3b844d3..42d60abf2ebe 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2162,7 +2162,6 @@ int r100_mc_wait_for_idle(struct radeon_device *rdev)
 bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
 {
         u32 rbbm_status;
-        int r;
 
         rbbm_status = RREG32(R_000E40_RBBM_STATUS);
         if (!G_000E40_GUI_ACTIVE(rbbm_status)) {
@@ -2170,14 +2169,7 @@ bool r100_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
                 return false;
         }
         /* force CP activities */
-        r = radeon_ring_lock(rdev, ring, 2);
-        if (!r) {
-                /* PACKET2 NOP */
-                radeon_ring_write(ring, 0x80000000);
-                radeon_ring_write(ring, 0x80000000);
-                radeon_ring_unlock_commit(rdev, ring);
-        }
-        ring->rptr = RREG32(ring->rptr_reg);
+        radeon_ring_force_activity(rdev, ring);
         return radeon_ring_test_lockup(rdev, ring);
 }