Skip to content

Commit

Permalink
drm/i915: set pm._irqs_disabled at IRQ init time
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jesse Barnes authored and Daniel Vetter committed Jul 23, 2014
1 parent 9df7575 commit 95f25be
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/i915_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -4669,6 +4669,9 @@ void intel_irq_init(struct drm_device *dev)

pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE);

/* Haven't installed the IRQ handler yet */
dev_priv->pm._irqs_disabled = true;

if (IS_GEN2(dev)) {
dev->max_vblank_count = 0;
dev->driver->get_vblank_counter = i8xx_get_vblank_counter;
Expand Down

0 comments on commit 95f25be

Please sign in to comment.