Ignore:
Timestamp:
Apr 18, 2017, 8:47:31 AM (6 weeks ago)
Author:
brainslayer
Message:

update kernels

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-4.9/drivers/gpu/drm/i915/intel_hotplug.c

    r31574 r31884  
    220220                }
    221221        }
    222         if (dev_priv->display.hpd_irq_setup)
     222        if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup)
    223223                dev_priv->display.hpd_irq_setup(dev_priv);
    224224        spin_unlock_irq(&dev_priv->irq_lock);
     
    426426        }
    427427
    428         if (storm_detected)
     428        if (storm_detected && dev_priv->display_irqs_enabled)
    429429                dev_priv->display.hpd_irq_setup(dev_priv);
    430430        spin_unlock(&dev_priv->irq_lock);
     
    472472         * just to make the assert_spin_locked checks happy.
    473473         */
    474         spin_lock_irq(&dev_priv->irq_lock);
    475         if (dev_priv->display.hpd_irq_setup)
    476                 dev_priv->display.hpd_irq_setup(dev_priv);
    477         spin_unlock_irq(&dev_priv->irq_lock);
     474        if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup) {
     475                spin_lock_irq(&dev_priv->irq_lock);
     476                if (dev_priv->display_irqs_enabled)
     477                        dev_priv->display.hpd_irq_setup(dev_priv);
     478                spin_unlock_irq(&dev_priv->irq_lock);
     479        }
    478480}
    479481
Note: See TracChangeset for help on using the changeset viewer.