Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f01c22fd authored by Chris Wilson's avatar Chris Wilson Committed by Keith Packard
Browse files

drm/i915: Use chipset-specific irq installers 



Konstantin Belousov pointed out that 4697995b 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 25732821

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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);

			ring->dev->driver->irq_preinstall(ring->dev);

			i915_driver_irq_postinstall(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);