diff options
| author | Chris Wilson | 2012-05-23 12:13:58 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-07-20 12:21:41 +0200 |
| commit | 79158103bf20c9ff55204ceb78a5773f422b03be (patch) | |
| tree | 520ff6549bc77a5e69ee0c7114def95af1516417 | |
| parent | drm/i915: don't forget the PCH backlight registers (diff) | |
| download | kernel-qcow2-linux-79158103bf20c9ff55204ceb78a5773f422b03be.tar.gz kernel-qcow2-linux-79158103bf20c9ff55204ceb78a5773f422b03be.tar.xz kernel-qcow2-linux-79158103bf20c9ff55204ceb78a5773f422b03be.zip | |
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 80fe02d2d733..c9b69e3b2c29 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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); |