Disable DRIVER_DMA_QUIESCENT() in r128, radeon drivers. Prevents deadlock
in the locking process when the engine isn't idle.main
parent
01a14789ed
commit
62aa46ccec
|
@ -60,11 +60,14 @@
|
||||||
*/
|
*/
|
||||||
#define __HAVE_DMA 1
|
#define __HAVE_DMA 1
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* GH: Remove this for now... */
|
||||||
#define __HAVE_DMA_QUIESCENT 1
|
#define __HAVE_DMA_QUIESCENT 1
|
||||||
#define DRIVER_DMA_QUIESCENT() do { \
|
#define DRIVER_DMA_QUIESCENT() do { \
|
||||||
drm_r128_private_t *dev_priv = dev->dev_private; \
|
drm_r128_private_t *dev_priv = dev->dev_private; \
|
||||||
return r128_do_cce_idle( dev_priv ); \
|
return r128_do_cce_idle( dev_priv ); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Buffer customization:
|
/* Buffer customization:
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -60,11 +60,14 @@
|
||||||
*/
|
*/
|
||||||
#define __HAVE_DMA 1
|
#define __HAVE_DMA 1
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* GH: Remove this for now... */
|
||||||
#define __HAVE_DMA_QUIESCENT 1
|
#define __HAVE_DMA_QUIESCENT 1
|
||||||
#define DRIVER_DMA_QUIESCENT() do { \
|
#define DRIVER_DMA_QUIESCENT() do { \
|
||||||
drm_radeon_private_t *dev_priv = dev->dev_private; \
|
drm_radeon_private_t *dev_priv = dev->dev_private; \
|
||||||
return radeon_do_cp_idle( dev_priv ); \
|
return radeon_do_cp_idle( dev_priv ); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Buffer customization:
|
/* Buffer customization:
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue