[Intel-gfx] [PATCH] drm/i915: Use chipset-specific irq installers

[Keith Packard]

On Tue, 28 Jun 2011 10:48:57 -0700, Ben Widawsky <ben at bwidawsk.net> wrote:

> I'm very nitpicky when it comes to the work assert :p

I pushed a much simpler patch:

----------------------- drivers/gpu/drm/i915/i915_gem.c -----------------------
index c6389de..e81dbe5 100644
@@ -2080,8 +2080,8 @@ i915_wait_request(struct intel_ring_buffer *ring,
 		if (!ier) {
 			DRM_ERROR("something (likely vbetool) disabled "
 				  "interrupts, re-enabling\n");
-			i915_driver_irq_preinstall(ring->dev);
-			i915_driver_irq_postinstall(ring->dev);
+			ring->dev->driver->irq_preinstall(ring->dev);
+			ring->dev->driver->irq_postinstall(ring->dev);
 		}
 
 		trace_i915_gem_request_wait_begin(ring, seqno);

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20110628/10494f01/attachment.sig>