diff options
| author | anholt <anholt@FreeBSD.org> | 2003-08-19 02:57:31 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-08-19 02:57:31 +0000 |
| commit | 55fc74037ce1fed2313813918c5380b1c642828e (patch) | |
| tree | e45c260fa868be8644bf3d316e3c7cc3cdc5a0eb /sys/dev/drm/mga_irq.c | |
| parent | f9627255eea8f589c728f37d9a3a6e0040a24291 (diff) | |
| download | FreeBSD-src-55fc74037ce1fed2313813918c5380b1c642828e.zip FreeBSD-src-55fc74037ce1fed2313813918c5380b1c642828e.tar.gz | |
Update DRM from DRI CVS as of today. Notable changes include Radeon
suspend/resume support and Rage 128 pageflipping support (both of which require
XFree86 from CVS), along with miscellaneous cleanups.
Diffstat (limited to 'sys/dev/drm/mga_irq.c')
| -rw-r--r-- | sys/dev/drm/mga_irq.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/drm/mga_irq.c b/sys/dev/drm/mga_irq.c index 9b2b691..1f8f2c8 100644 --- a/sys/dev/drm/mga_irq.c +++ b/sys/dev/drm/mga_irq.c @@ -38,7 +38,7 @@ #include "dev/drm/mga_drm.h" #include "dev/drm/mga_drv.h" -void mga_dma_service( DRM_IRQ_ARGS ) +irqreturn_t mga_dma_service( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_mga_private_t *dev_priv = @@ -53,7 +53,9 @@ void mga_dma_service( DRM_IRQ_ARGS ) atomic_inc(&dev->vbl_received); DRM_WAKEUP(&dev->vbl_queue); DRM(vbl_send_signals)( dev ); + return IRQ_HANDLED; } + return IRQ_NONE; } int mga_vblank_wait(drm_device_t *dev, unsigned int *sequence) @@ -95,8 +97,9 @@ void mga_driver_irq_postinstall( drm_device_t *dev ) { void mga_driver_irq_uninstall( drm_device_t *dev ) { drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private; - if ( dev_priv ) { - /* Disable *all* interrupts */ - MGA_WRITE( MGA_IEN, 0 ); - } + if (!dev_priv) + return; + + /* Disable *all* interrupts */ + MGA_WRITE( MGA_IEN, 0 ); } |
