diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-28 11:48:51 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-28 10:20:06 -0700 |
| commit | f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3 (patch) | |
| tree | f305fa0368e2c94fc438d5bdf700eb65e1284299 | |
| parent | 25732821cb965f00475922ca46e84f78e4bada95 (diff) | |
| download | kernel_goldelico_gta04-f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3.zip kernel_goldelico_gta04-f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3.tar.gz kernel_goldelico_gta04-f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3.tar.bz2 | |
drm/i915: Use chipset-specific irq installers
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c6389de..e81dbe5 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -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); |