Attachment 62008 Details for Bug 50069 – Make the lock for pageflips interruptible

[patch] Make the lock for pageflips interruptible

0001-drm-i915-Make-the-lock-for-pageflips-interruptible.patch (text/plain), 1.44 KB, created by Chris Wilson on 2012-05-23 03:08:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-05-23 03:08:38 UTC

Size: 1.44 KB

patch

obsolete

>From f010f184585176392721b742164a19e9042d6eb5 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 23 May 2012 11:05:23 +0100
>Subject: [PATCH] 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: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_display.c |    5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 198f46a..30dfa0d 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -6137,7 +6137,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);
>@@ -6172,6 +6174,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);
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 50069: 61771 | 61992 | 61996 | 62008 | 62015 | 62690 | 63054 | 63163

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.