From 35066b51efeb0d2ae9b4ba7fba066f80f798539d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 26 Jul 2006 18:21:32 +0200 Subject: 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. --- shared-core/radeon_cp.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'shared-core/radeon_cp.c') 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)); -- cgit v1.2.3