diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2014-06-20 09:29:22 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-23 07:05:34 +0200 |
| commit | 95f25beddba2ec9510b249740bacc11eca70cf75 (patch) | |
| tree | 580cde0770d4f4ab547fe733272be537fd60d70e /drivers/gpu/drm/i915 | |
| parent | 9df7575f1c751a333b1989d1c7e2b9fc884d9105 (diff) | |
| download | op-kernel-dev-95f25beddba2ec9510b249740bacc11eca70cf75.zip op-kernel-dev-95f25beddba2ec9510b249740bacc11eca70cf75.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 3 |
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 6774f88..6cdaecf 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) 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; |
