diff options
| author | Linus Torvalds | 2011-06-28 20:15:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-06-28 20:15:57 +0200 |
| commit | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (patch) | |
| tree | b2777db7513e14b0341088eea96c869a8071abc4 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | drm/i915: Use chipset-specific irq installers (diff) | |
| download | kernel-qcow2-linux-0d72c6fcb5cd215eeab824fac216ea42c5b574aa.tar.gz kernel-qcow2-linux-0d72c6fcb5cd215eeab824fac216ea42c5b574aa.tar.xz kernel-qcow2-linux-0d72c6fcb5cd215eeab824fac216ea42c5b574aa.zip | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915: Use chipset-specific irq installers
drm/i915: forcewake fix after reset
drm/i915: add Ivy Bridge page flip support
drm/i915: split page flip queueing into per-chipset functions
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -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 85f713746a1f..5c0d1247f453 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2072,8 +2072,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); |