14 files changed, 15 insertions, 69 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 82f7aea14a6e..f39b900d46f9 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3093,10 +3093,6 @@ static int evergreen_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         r = r600_audio_init(rdev);
         if (r) {
                 DRM_ERROR("radeon: audio init failed\n");
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index ec5307c582f4..f2afefb44b7c 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1276,10 +1276,6 @@ static int cayman_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         r = radeon_vm_manager_init(rdev);
         if (r) {
                 dev_err(rdev->dev, "vm manager initialization failed (%d).\n", r);
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 9524bd4aca75..e0f5ae895f07 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3887,10 +3887,6 @@ static int r100_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index b396e341a7b8..646a1927dda7 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1397,10 +1397,6 @@ static int r300_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 0062938a589c..f2f5bf6d339f 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -281,10 +281,6 @@ static int r420_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 6df3e51acb9f..079d3c52c08a 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -209,10 +209,6 @@ static int r520_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index af2f74a27081..c808fa976d2d 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2395,10 +2395,6 @@ int r600_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         r = r600_audio_init(rdev);
         if (r) {
                 DRM_ERROR("radeon: audio init failed\n");
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 254fdb4f73c9..bbd09718e956 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -822,6 +822,10 @@ int radeon_device_init(struct radeon_device *rdev,
         if (r)
                 return r;
 
+        r = radeon_ib_ring_tests(rdev);
+        if (r)
+                DRM_ERROR("ib ring test failed (%d).\n", r);
+
         if (rdev->flags & RADEON_IS_AGP && !rdev->accel_working) {
                 /* Acceleration not working on AGP card try again
                  * with fallback to PCI or PCIE GART
@@ -946,6 +950,7 @@ int radeon_resume_kms(struct drm_device *dev)
 {
         struct drm_connector *connector;
         struct radeon_device *rdev = dev->dev_private;
+        int r;
 
         if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
                 return 0;
@@ -960,6 +965,11 @@ int radeon_resume_kms(struct drm_device *dev)
         /* resume AGP if in use */
         radeon_agp_resume(rdev);
         radeon_resume(rdev);
+
+        r = radeon_ib_ring_tests(rdev);
+        if (r)
+                DRM_ERROR("ib ring test failed (%d).\n", r);
+
         radeon_pm_resume(rdev);
         radeon_restore_bios_scratch_regs(rdev);
 
@@ -999,6 +1009,11 @@ int radeon_gpu_reset(struct radeon_device *rdev)
         if (!r) {
                 dev_info(rdev->dev, "GPU reset succeed\n");
                 radeon_resume(rdev);
+
+                r = radeon_ib_ring_tests(rdev);
+                if (r)
+                        DRM_ERROR("ib ring test failed (%d).\n", r);
+
                 radeon_restore_bios_scratch_regs(rdev);
                 drm_helper_resume_force_mode(rdev->ddev);
                 ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched);
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index aa26076ff468..2752f7f78237 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -432,10 +432,6 @@ static int rs400_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 6dad4e617727..5301b3df8466 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -913,10 +913,6 @@ static int rs600_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         r = r600_audio_init(rdev);
         if (r) {
                 dev_err(rdev->dev, "failed initializing audio\n");
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 0c026b0210d4..3b663fcfe061 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -643,10 +643,6 @@ static int rs690_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         r = r600_audio_init(rdev);
         if (r) {
                 dev_err(rdev->dev, "failed initializing audio\n");
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 01e9155541ea..a12fbcc8ccb6 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -414,10 +414,6 @@ static int rv515_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 2004f0d94f24..b4b1256fb15b 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -957,10 +957,6 @@ static int rv770_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_ring_tests(rdev);
-        if (r)
-                return r;
-
         r = r600_audio_init(rdev);
         if (r) {
                 DRM_ERROR("radeon: audio init failed\n");
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 2b691abef4f7..f61b550f9efd 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -3756,27 +3756,6 @@ static int si_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = radeon_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]);
-        if (r) {
-                DRM_ERROR("radeon: failed testing IB (%d) on CP ring 0\n", r);
-                rdev->accel_working = false;
-                return r;
-        }
-
-        r = radeon_ib_test(rdev, CAYMAN_RING_TYPE_CP1_INDEX, &rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX]);
-        if (r) {
-                DRM_ERROR("radeon: failed testing IB (%d) on CP ring 1\n", r);
-                rdev->accel_working = false;
-                return r;
-        }
-
-        r = radeon_ib_test(rdev, CAYMAN_RING_TYPE_CP2_INDEX, &rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX]);
-        if (r) {
-                DRM_ERROR("radeon: failed testing IB (%d) on CP ring 2\n", r);
-                rdev->accel_working = false;
-                return r;
-        }
-
         r = radeon_vm_manager_init(rdev);
         if (r) {
                 dev_err(rdev->dev, "vm manager initialization failed (%d).\n", r);