drm/i915: Use chipset-specific irq installers
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 28 Jun 2011 10:48:51 +0000 (11:48 +0100)
committerKeith Packard <keithp@keithp.com>
Tue, 28 Jun 2011 17:20:06 +0000 (10:20 -0700)
Konstantin Belousov pointed out that 4697995b98417 replaced the generic
i915_driver_irq_*install() functions with chipset specific routines
accessible only through driver->irq_*install(). So update the sanity
check in i915_request_wait() to match.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
drivers/gpu/drm/i915/i915_gem.c

index c6389de531612c11d78439207ebd051ba804e3a1..e81dbe57c7737100e1248075feac0ebcd86a604f 100644 (file)
@@ -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);