Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d6a3dd authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: don't enable PM_VEBOX_CS_ERROR_INTERRUPT 



The code to handle it is broken - there's simply no code to clear CS
parser errors on gen5+. And behold, for all the other rings we also
don't enable it!

Leave the handling code itself in place just to be consistent with the
existing mess though. And in case someone feels like fixing it all up.

This has been errornously enabled in

commit 12638c57
Author: Ben Widawsky <ben@bwidawsk.net>
Date:   Tue May 28 19:22:31 2013 -0700

    drm/i915: Enable vebox interrupts

Cc: Damien Lespiau <damien.lespiau@intel.com>
Cc: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c7113cc3

drivers/gpu/drm/i915/i915_irq.c

+1 −2
Original line number Diff line number Diff line
@@ -2814,8 +2814,7 @@ static int ivybridge_irq_postinstall(struct drm_device *dev) 


	I915_WRITE(GEN6_PMIIR, I915_READ(GEN6_PMIIR));

	if (HAS_VEBOX(dev))

		pm_irqs |= PM_VEBOX_USER_INTERRUPT |

			PM_VEBOX_CS_ERROR_INTERRUPT;

		pm_irqs |= PM_VEBOX_USER_INTERRUPT;



	/* Our enable/disable rps functions may touch these registers so

	 * make sure to set a known state for only the non-RPS bits.

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −2
Original line number Diff line number Diff line
@@ -2000,8 +2000,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) 
	ring->add_request = gen6_add_request;

	ring->get_seqno = gen6_ring_get_seqno;

	ring->set_seqno = ring_set_seqno;

	ring->irq_enable_mask = PM_VEBOX_USER_INTERRUPT |

		PM_VEBOX_CS_ERROR_INTERRUPT;

	ring->irq_enable_mask = PM_VEBOX_USER_INTERRUPT;

	ring->irq_get = hsw_vebox_get_irq;

	ring->irq_put = hsw_vebox_put_irq;

	ring->dispatch_execbuffer = gen6_ring_dispatch_execbuffer;