summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2003-09-05 12:48:39 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2003-09-05 12:48:39 +0000
commita9c56532346b9e8f5372bfd3ee6bbc775ab1c47b (patch)
treea46d87e74a445812737197e88c783a3ff933c370
parent7f056c0f9b1975d6e1ff51b16bfc94ae121646e8 (diff)
Work around occasionally missed irqs on FreeBSD + certain combinations ofi865-agp-0-1-20030905
motherboards and older r200 cards.
-rw-r--r--shared-core/radeon_irq.c6
-rw-r--r--shared/radeon_irq.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index c6bd90e58..8de04b44c 100644
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -71,8 +71,8 @@ void DRM(dma_service)( DRM_IRQ_ARGS )
/* SW interrupt */
if (stat & RADEON_SW_INT_TEST) {
- DRM_WAKEUP( &dev_priv->swi_queue );
}
+ DRM_WAKEUP( &dev_priv->swi_queue );
/* VBLANK interrupt */
if (stat & RADEON_CRTC_VBLANK_STAT) {
@@ -126,7 +126,7 @@ int radeon_wait_irq(drm_device_t *dev, int swi_nr)
/* This is a hack to work around mysterious freezes on certain
* systems:
*/
- radeon_acknowledge_irqs( dev_priv );
+/* radeon_acknowledge_irqs( dev_priv ); */
DRM_WAIT_ON( ret, dev_priv->swi_queue, 3 * DRM_HZ,
RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr );
@@ -152,7 +152,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
return DRM_ERR(EINVAL);
}
- radeon_acknowledge_irqs( dev_priv );
+/* radeon_acknowledge_irqs( dev_priv ); */
dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
diff --git a/shared/radeon_irq.c b/shared/radeon_irq.c
index c6bd90e58..8de04b44c 100644
--- a/shared/radeon_irq.c
+++ b/shared/radeon_irq.c
@@ -71,8 +71,8 @@ void DRM(dma_service)( DRM_IRQ_ARGS )
/* SW interrupt */
if (stat & RADEON_SW_INT_TEST) {
- DRM_WAKEUP( &dev_priv->swi_queue );
}
+ DRM_WAKEUP( &dev_priv->swi_queue );
/* VBLANK interrupt */
if (stat & RADEON_CRTC_VBLANK_STAT) {
@@ -126,7 +126,7 @@ int radeon_wait_irq(drm_device_t *dev, int swi_nr)
/* This is a hack to work around mysterious freezes on certain
* systems:
*/
- radeon_acknowledge_irqs( dev_priv );
+/* radeon_acknowledge_irqs( dev_priv ); */
DRM_WAIT_ON( ret, dev_priv->swi_queue, 3 * DRM_HZ,
RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr );
@@ -152,7 +152,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
return DRM_ERR(EINVAL);
}
- radeon_acknowledge_irqs( dev_priv );
+/* radeon_acknowledge_irqs( dev_priv ); */
dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;