From: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed, 26 Jul 2006 16:21:32 +0000 (+0200)
Subject: Revert "Make sure busmastering gets disabled on module unload."
X-Git-Tag: libdrm-2.3.1~572
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35066b51efeb0d2ae9b4ba7fba066f80f798539d;p=platform%2Fupstream%2Flibdrm.git

Revert "Make sure busmastering gets disabled on module unload."

This reverts af7b89d7246efbed7d05c38fcaa6a13c4b89db90 commit. It causes an oops
on X server shutdown here, and for the reporter of bug #7629 as well.
---

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 12ba7ba..4e7b282 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -1720,11 +1720,6 @@ static int radeon_do_cleanup_cp(drm_device_t * dev)
 			dev_priv->gart_info.addr = 0;
 		}
 	}
-
-	/* Disable busmastering */
-	RADEON_WRITE(RADEON_BUS_CNTL, RADEON_READ(RADEON_BUS_CNTL) |
-		RADEON_BUS_MASTER_DIS);
-
 	/* only clear to the start of flags */
 	memset(dev_priv, 0, offsetof(drm_radeon_private_t, flags));