]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm: fixup i915 interrupt on X server exit
authorDave Airlie <airlied@linux.ie>
Sat, 18 Feb 2006 04:17:04 +0000 (15:17 +1100)
committerDave Airlie <airlied@linux.ie>
Sat, 18 Feb 2006 04:17:04 +0000 (15:17 +1100)
Fixes: IRQ disabled (i915?) when switchig between gnome themes (gnome-theme-manager)
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/i915_irq.c

index a1381c61aa631e3b9e27f9256157897c9dfaa1db..d3879ac9970f7f991167e9ade90f510b0f93a8c6 100644 (file)
@@ -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);
 }