1 files changed, 18 insertions, 15 deletions

diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 4f2098bc7974..be2f86539ebc 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -953,6 +953,7 @@ int rv770_init(struct radeon_device *rdev)
         if (r)
                 return r;
 
+        rdev->accel_working = true;
         r = rv770_resume(rdev);
         if (r) {
                 if (rdev->flags & RADEON_IS_AGP) {
@@ -961,22 +962,24 @@ int rv770_init(struct radeon_device *rdev)
                         rdev->flags &= ~RADEON_IS_AGP;
                         return rv770_init(rdev);
                 }
-                return r;
-        }
-        r = r600_blit_init(rdev);
-        if (r) {
-                DRM_ERROR("radeon: failled blitter (%d).\n", r);
-                return r;
+                rdev->accel_working = false;
         }
-        r = radeon_ib_pool_init(rdev);
-        if (r) {
-                DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
-                return r;
-        }
-        r = radeon_ib_test(rdev);
-        if (r) {
-                DRM_ERROR("radeon: failled testing IB (%d).\n", r);
-                        return r;
+        if (rdev->accel_working) {
+                r = r600_blit_init(rdev);
+                if (r) {
+                        DRM_ERROR("radeon: failled blitter (%d).\n", r);
+                        rdev->accel_working = false;
+                }
+                r = radeon_ib_pool_init(rdev);
+                if (r) {
+                        DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);
+                        rdev->accel_working = false;
+                }
+                r = radeon_ib_test(rdev);
+                if (r) {
+                        DRM_ERROR("radeon: failled testing IB (%d).\n", r);
+                        rdev->accel_working = false;
+                }
         }
         return 0;
 }