diff options
| author | Ian Romanick <idr@us.ibm.com> | 2002-12-05 15:28:13 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2002-12-05 15:28:13 +0000 |
| commit | a790687c9a4b369094a2a56e29a8240db573a54a (patch) | |
| tree | d6a1201e666b487fac353e4aa70312ee1646c33c /shared/r128_irq.c | |
| parent | 9cfbdbadecaa7f2c89bd361d157e23a885ae5d10 (diff) | |
Massive trunk-to-branch merge. This includes the Mesa-5.x updates.texmem-0-0-1-20030123-trunk-premerge
Diffstat (limited to 'shared/r128_irq.c')
| -rw-r--r-- | shared/r128_irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared/r128_irq.c b/shared/r128_irq.c index a29a81b5..bfc30405 100644 --- a/shared/r128_irq.c +++ b/shared/r128_irq.c @@ -50,6 +50,7 @@ void r128_dma_service( DRM_IRQ_ARGS ) R128_WRITE( R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK ); atomic_inc(&dev->vbl_received); DRM_WAKEUP(&dev->vbl_queue); + DRM(vbl_send_signals)( dev ); } } @@ -64,7 +65,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence) */ DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) ) - + ~*sequence + 1 ) <= (1<<23) ) ); + - *sequence ) <= (1<<23) ) ); *sequence = cur_vblank; |