drm/radeon: move lockup detection code into radeon_ring.c

It isn't chipset specific, so it makes no sense
to have that inside r100.c.

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, 2 insertions, 8 deletions

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 6070f9099507..45d52ccc457a 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1350,19 +1350,13 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
         u32 srbm_status;
         u32 grbm_status;
         u32 grbm_status2;
-        struct r100_gpu_lockup *lockup;
         int r;
 
-        if (rdev->family >= CHIP_RV770)
-                lockup = &rdev->config.rv770.lockup;
-        else
-                lockup = &rdev->config.r600.lockup;
-
         srbm_status = RREG32(R_000E50_SRBM_STATUS);
         grbm_status = RREG32(R_008010_GRBM_STATUS);
         grbm_status2 = RREG32(R_008014_GRBM_STATUS2);
         if (!G_008010_GUI_ACTIVE(grbm_status)) {
-                r100_gpu_lockup_update(lockup, ring);
+                radeon_ring_lockup_update(ring);
                 return false;
         }
         /* force CP activities */
@@ -1374,7 +1368,7 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
                 radeon_ring_unlock_commit(rdev, ring);
         }
         ring->rptr = RREG32(ring->rptr_reg);
-        return r100_gpu_cp_is_lockup(rdev, lockup, ring);
+        return radeon_ring_test_lockup(rdev, ring);
 }
 
 int r600_asic_reset(struct radeon_device *rdev)