drm/i915: Unbreak interrupts on pre-gen6
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 12 Jul 2016 16:24:47 +0000 (19:24 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 14 Jul 2016 13:48:49 +0000 (15:48 +0200)
Prior to gen6 we didn't have per-ring IMR registers, which means that
since commit 61ff75ac20ff ("drm/i915: Simplify enabling
user-interrupts with L3-remapping") we're now masking off all interrupts
when init_render_ring() gets called. That's rather rude. Let's limit
the ring IMR frobbing to machines that actually have the per-ring IMR
registers.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 61ff75ac20ff ("drm/i915: Simplify enabling user-interrupts with L3-remapping")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1468340687-3596-1-git-send-email-ville.syrjala@linux.intel.com
Reviewd-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 035ea405c91e2dc89325a79129cf9af2b9c2ae8e)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_ringbuffer.c

index 61e00bf9e87f928f672ebe9c35243887725d82f4..c8e77c082b21c91a43bd79c6469b121384292340 100644 (file)
@@ -1305,7 +1305,8 @@ static int init_render_ring(struct intel_engine_cs *engine)
        if (IS_GEN(dev_priv, 6, 7))
                I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
 
-       I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
+       if (INTEL_INFO(dev_priv)->gen >= 6)
+               I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
 
        return init_workarounds_ring(engine);
 }