projects
/
platform
/
upstream
/
libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
645453c
)
Revert "Make sure busmastering gets disabled on module unload."
author
Michel Dänzer
<michel@tungstengraphics.com>
Wed, 26 Jul 2006 16:21:32 +0000
(18:21 +0200)
committer
Michel Dänzer
<michel@tungstengraphics.com>
Wed, 26 Jul 2006 16:21:32 +0000
(18:21 +0200)
This reverts
af7b89d7246efbed7d05c38fcaa6a13c4b89db90
commit. It causes an oops
on X server shutdown here, and for the reporter of bug #7629 as well.
shared-core/radeon_cp.c
patch
|
blob
|
history
diff --git
a/shared-core/radeon_cp.c
b/shared-core/radeon_cp.c
index
12ba7ba
..
4e7b282
100644
(file)
--- 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));