From 62aa46ccec223aa3660c71ff0981ea035fc2cff9 Mon Sep 17 00:00:00 2001 From: Gareth Hughes Date: Tue, 20 Feb 2001 13:44:45 +0000 Subject: Disable DRIVER_DMA_QUIESCENT() in r128, radeon drivers. Prevents deadlock in the locking process when the engine isn't idle. --- linux/r128.h | 3 +++ linux/radeon.h | 3 +++ 2 files changed, 6 insertions(+) (limited to 'linux') diff --git a/linux/r128.h b/linux/r128.h index 2f045534..83e002af 100644 --- a/linux/r128.h +++ b/linux/r128.h @@ -60,11 +60,14 @@ */ #define __HAVE_DMA 1 +#if 0 +/* GH: Remove this for now... */ #define __HAVE_DMA_QUIESCENT 1 #define DRIVER_DMA_QUIESCENT() do { \ drm_r128_private_t *dev_priv = dev->dev_private; \ return r128_do_cce_idle( dev_priv ); \ } while (0) +#endif /* Buffer customization: */ diff --git a/linux/radeon.h b/linux/radeon.h index 6062f82f..db238b1b 100644 --- a/linux/radeon.h +++ b/linux/radeon.h @@ -60,11 +60,14 @@ */ #define __HAVE_DMA 1 +#if 0 +/* GH: Remove this for now... */ #define __HAVE_DMA_QUIESCENT 1 #define DRIVER_DMA_QUIESCENT() do { \ drm_radeon_private_t *dev_priv = dev->dev_private; \ return radeon_do_cp_idle( dev_priv ); \ } while (0) +#endif /* Buffer customization: */ -- cgit v1.2.3