瀏覽代碼

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>
Chris Wilson 14 年之前
父節點
當前提交
f01c22fd59
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/gpu/drm/i915/i915_gem.c

+ 2 - 2
drivers/gpu/drm/i915/i915_gem.c

@@ -2080,8 +2080,8 @@ i915_wait_request(struct intel_ring_buffer *ring,
 		if (!ier) {
 		if (!ier) {
 			DRM_ERROR("something (likely vbetool) disabled "
 			DRM_ERROR("something (likely vbetool) disabled "
 				  "interrupts, re-enabling\n");
 				  "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);
 		trace_i915_gem_request_wait_begin(ring, seqno);