summaryrefslogtreecommitdiff
path: root/shared-core/radeon_cp.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2006-07-26 18:21:32 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2006-07-26 18:21:32 +0200
commit35066b51efeb0d2ae9b4ba7fba066f80f798539d (patch)
treef6b8d6cf324ad828e221928909763d96645ee558 /shared-core/radeon_cp.c
parent645453ce11f819c4e9dd9be95ce9d621dc7d466b (diff)
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.
Diffstat (limited to 'shared-core/radeon_cp.c')
-rw-r--r--shared-core/radeon_cp.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 12ba7ba3..4e7b2823 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));