diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-04-10 07:41:19 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-04-10 07:41:19 +0000 |
| commit | 23ec8875fce631e4554a72161937dca735c2d675 (patch) | |
| tree | a3f923cb4d760e583e061ffb871e02a40bb48857 | |
| parent | 6aad146173e2442eb0dbb10d02ddcd8a62808937 (diff) | |
align code with Linux kernel.
| -rw-r--r-- | linux-core/i830_irq.c | 6 | ||||
| -rw-r--r-- | linux/i830_irq.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/linux-core/i830_irq.c b/linux-core/i830_irq.c index 6d45cda8..ae27f3bd 100644 --- a/linux-core/i830_irq.c +++ b/linux-core/i830_irq.c @@ -186,6 +186,9 @@ void DRM(driver_irq_preinstall)( drm_device_t *dev ) { I830_WRITE16( I830REG_HWSTAM, 0xffff ); I830_WRITE16( I830REG_INT_MASK_R, 0x0 ); I830_WRITE16( I830REG_INT_ENABLE_R, 0x0 ); + atomic_set(&dev_priv->irq_received, 0); + atomic_set(&dev_priv->irq_emitted, 0); + init_waitqueue_head(&dev_priv->irq_queue); } void DRM(driver_irq_postinstall)( drm_device_t *dev ) { @@ -193,9 +196,6 @@ void DRM(driver_irq_postinstall)( drm_device_t *dev ) { (drm_i830_private_t *)dev->dev_private; I830_WRITE16( I830REG_INT_ENABLE_R, 0x2 ); - atomic_set(&dev_priv->irq_received, 0); - atomic_set(&dev_priv->irq_emitted, 0); - init_waitqueue_head(&dev_priv->irq_queue); } void DRM(driver_irq_uninstall)( drm_device_t *dev ) { diff --git a/linux/i830_irq.c b/linux/i830_irq.c index 6d45cda8..ae27f3bd 100644 --- a/linux/i830_irq.c +++ b/linux/i830_irq.c @@ -186,6 +186,9 @@ void DRM(driver_irq_preinstall)( drm_device_t *dev ) { I830_WRITE16( I830REG_HWSTAM, 0xffff ); I830_WRITE16( I830REG_INT_MASK_R, 0x0 ); I830_WRITE16( I830REG_INT_ENABLE_R, 0x0 ); + atomic_set(&dev_priv->irq_received, 0); + atomic_set(&dev_priv->irq_emitted, 0); + init_waitqueue_head(&dev_priv->irq_queue); } void DRM(driver_irq_postinstall)( drm_device_t *dev ) { @@ -193,9 +196,6 @@ void DRM(driver_irq_postinstall)( drm_device_t *dev ) { (drm_i830_private_t *)dev->dev_private; I830_WRITE16( I830REG_INT_ENABLE_R, 0x2 ); - atomic_set(&dev_priv->irq_received, 0); - atomic_set(&dev_priv->irq_emitted, 0); - init_waitqueue_head(&dev_priv->irq_queue); } void DRM(driver_irq_uninstall)( drm_device_t *dev ) { |