Merge commit 'origin/drm-gem' into modesetting-gem

[android-x86/external-libdrm.git] / linux-core / i915_opregion.c

diff --git a/linux-core/i915_opregion.c b/linux-core/i915_opregion.c
index d015db2..1fa599e 100644 (file)
--- a/linux-core/i915_opregion.c
+++ b/linux-core/i915_opregion.c
@@ -248,22 +248,21 @@ void opregion_enable_asle(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct opregion_asle *asle = dev_priv->opregion.asle;
-       u32 mask = 0;
 
        if (asle) {
-               u32 pipeb_stats = I915_READ(PIPEBSTAT);
                if (IS_MOBILE(dev)) {
+                       u32 pipeb_stats = I915_READ(PIPEBSTAT);
                        /* Some hardware uses the legacy backlight controller
                           to signal interrupts, so we need to set up pipe B
                           to generate an IRQ on writes */
-                       I915_WRITE(PIPEBSTAT, pipeb_stats |= 
-                                  I915_LEGACY_BLC_EVENT_ENABLE);
-                       mask = I915_ASLE_INTERRUPT |
-                               I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
-               } else
-                       mask = I915_ASLE_INTERRUPT;
-               
-               dev_priv->irq_mask_reg &= ~mask;
+                       pipeb_stats |= I915_LEGACY_BLC_EVENT_ENABLE;
+                       I915_WRITE(PIPEBSTAT, pipeb_stats);
+
+                       dev_priv->irq_mask_reg &=
+                               ~I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
+               }
+
+               dev_priv->irq_mask_reg &= ~I915_ASLE_INTERRUPT;
 
                asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN | 
                        ASLE_PFMB_EN;