On Tue, 28 Jun 2011 10:48:57 -0700, Ben Widawsky <[email protected]> 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);

-- 
[email protected]

Attachment: pgpukLKOwOlMw.pgp
Description: PGP signature

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to