1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index bfd36ab643a6..333cde9d4e7b 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -789,9 +789,7 @@ int r100_irq_process(struct radeon_device *rdev)
                         WREG32(RADEON_AIC_CNTL, msi_rearm | RS400_MSI_REARM);
                         break;
                 default:
-                        msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN;
-                        WREG32(RADEON_MSI_REARM_EN, msi_rearm);
-                        WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN);
+                        WREG32(RADEON_MSI_REARM_EN, RV370_MSI_REARM_EN);
                         break;
                 }
         }
@@ -3930,6 +3928,8 @@ static int r100_startup(struct radeon_device *rdev)
 
 int r100_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         if (rdev->flags & RADEON_IS_PCI)
                 r100_pci_gart_disable(rdev);
@@ -3949,7 +3949,11 @@ int r100_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return r100_startup(rdev);
+        r = r100_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int r100_suspend(struct radeon_device *rdev)