drm/radeon/kms: R3XX-R4XX fix GPU reset code

[net-next-2.6.git] / drivers / gpu / drm / radeon / r300.c

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index bb005bff4b088cf15c571d56e9c6a4bc8b084889..5d622cb39b331203700aaadc1cdd7c6bece23277 100644 (file)
--- 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);