summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGareth Hughes <gareth@users.sourceforge.net>2001-02-20 13:44:45 +0000
committerGareth Hughes <gareth@users.sourceforge.net>2001-02-20 13:44:45 +0000
commit62aa46ccec223aa3660c71ff0981ea035fc2cff9 (patch)
treeea904d8ed4d751b9672c5a6310b780f1d4945dce /linux
parent01a14789edce0ce1cae0f3fd4328833399fae56d (diff)
Disable DRIVER_DMA_QUIESCENT() in r128, radeon drivers. Prevents deadlock
in the locking process when the engine isn't idle.
Diffstat (limited to 'linux')
-rw-r--r--linux/r128.h3
-rw-r--r--linux/radeon.h3
2 files changed, 6 insertions, 0 deletions
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:
*/