summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@theobromine.nwnk.net>2006-07-19 15:35:31 -0400
committerAdam Jackson <ajax@theobromine.nwnk.net>2006-07-19 15:35:31 -0400
commitaf7b89d7246efbed7d05c38fcaa6a13c4b89db90 (patch)
treede22daa934ed8d41b4ef90153319b653c39fb1f6
parentd5e0f8bdaf8769642950b8219f0e80f6b523817d (diff)
Make sure busmastering gets disabled on module unload.
-rw-r--r--shared-core/radeon_cp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 695b5ecb..299ec6a6 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -1719,6 +1719,11 @@ 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));