2 files changed, 1 insertions, 9 deletions

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index bb005bff4b08..5d622cb39b33 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -445,14 +445,6 @@ int r300_asic_reset(struct radeon_device *rdev)
         mdelay(1);
         status = RREG32(R_000E40_RBBM_STATUS);
         dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status);
-        /* reset MC */
-        WREG32(R_0000F0_RBBM_SOFT_RESET, S_0000F0_SOFT_RESET_MC(1));
-        RREG32(R_0000F0_RBBM_SOFT_RESET);
-        mdelay(500);
-        WREG32(R_0000F0_RBBM_SOFT_RESET, 0);
-        mdelay(1);
-        status = RREG32(R_000E40_RBBM_STATUS);
-        dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status);
         /* restore PCI & busmastering */
         pci_restore_state(rdev->pdev);
         r100_enable_bm(rdev);
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 1b8b9cc271f2..b1f9a81b5d1d 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -237,10 +237,10 @@ retry:
                          * as signaled for now
                          */
                         rdev->gpu_lockup = true;
-                        WREG32(rdev->fence_drv.scratch_reg, fence->seq);
                         r = radeon_gpu_reset(rdev);
                         if (r)
                                 return r;
+                        WREG32(rdev->fence_drv.scratch_reg, fence->seq);
                         rdev->gpu_lockup = false;
                 }
                 timeout = RADEON_FENCE_JIFFIES_TIMEOUT;