diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-24 03:16:27 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-24 03:16:27 +0100 |
| commit | 7b0386921db20add25afd8678ed34a9253e512fc (patch) | |
| tree | 8c6b888b76211e38e6c1c3006553dc4b2b24c75e /drivers/char/drm/i915_irq.c | |
| parent | Merge branch 'forcedeth' (diff) | |
| parent | Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff) | |
| download | linux-7b0386921db20add25afd8678ed34a9253e512fc.tar.xz linux-7b0386921db20add25afd8678ed34a9253e512fc.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/char/drm/i915_irq.c')
| -rw-r--r-- | drivers/char/drm/i915_irq.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index a1381c61aa63..d3879ac9970f 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c @@ -202,10 +202,15 @@ void i915_driver_irq_postinstall(drm_device_t * dev) void i915_driver_irq_uninstall(drm_device_t * dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; + u16 temp; + if (!dev_priv) return; I915_WRITE16(I915REG_HWSTAM, 0xffff); I915_WRITE16(I915REG_INT_MASK_R, 0xffff); I915_WRITE16(I915REG_INT_ENABLE_R, 0x0); + + temp = I915_READ16(I915REG_INT_IDENTITY_R); + I915_WRITE16(I915REG_INT_IDENTITY_R, temp); } |