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

Commit 79158103 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Make the lock for pageflips interruptible 

As we take the struct_mutex lock to access the command-stream, there is
a possibility that we may need to wait for a GPU hang and so should make
the lock both interruptible and error-checking.

References: https://bugs.freedesktop.org/show_bug.cgi?id=50069


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a4f32fc3

drivers/gpu/drm/i915/intel_display.c

+4 −1
Original line number Diff line number Diff line
@@ -6486,7 +6486,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, 
	intel_fb = to_intel_framebuffer(fb);

	obj = intel_fb->obj;



	mutex_lock(&dev->struct_mutex);

	ret = i915_mutex_lock_interruptible(dev);

	if (ret)

		goto cleanup;



	/* Reference the objects for the scheduled work. */

	drm_gem_object_reference(&work->old_fb_obj->base);
@@ -6521,6 +6523,7 @@ cleanup_pending: 
	drm_gem_object_unreference(&obj->base);

	mutex_unlock(&dev->struct_mutex);



cleanup:

	spin_lock_irqsave(&dev->event_lock, flags);

	intel_crtc->unpin_work = NULL;

	spin_unlock_irqrestore(&dev->event_lock, flags);