aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2014-06-20 12:29:22 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-23 01:05:34 -0400
commit95f25beddba2ec9510b249740bacc11eca70cf75 (patch)
tree580cde0770d4f4ab547fe733272be537fd60d70e
parent9df7575f1c751a333b1989d1c7e2b9fc884d9105 (diff)
drm/i915: set pm._irqs_disabled at IRQ init time
Before we've installed the handler, we can set this and avoid confusing init code that then thinks IRQs are enabled and spews complaints everywhere. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6774f88479ec..6cdaecf0990c 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -4669,6 +4669,9 @@ void intel_irq_init(struct drm_device *dev)
4669 4669
4670 pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE); 4670 pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE);
4671 4671
4672 /* Haven't installed the IRQ handler yet */
4673 dev_priv->pm._irqs_disabled = true;
4674
4672 if (IS_GEN2(dev)) { 4675 if (IS_GEN2(dev)) {
4673 dev->max_vblank_count = 0; 4676 dev->max_vblank_count = 0;
4674 dev->driver->get_vblank_counter = i8xx_get_vblank_counter; 4677 dev->driver->get_vblank_counter = i8xx_get_vblank_counter;