Patch "drm/i915: drop the struct_mutex when wedged or trying to reset" has been added to the 4.8-stable tree

This is a note to let you know that I've just added the patch titled

drm/i915: drop the struct_mutex when wedged or trying to reset

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-drop-the-struct_mutex-when-wedged-or-trying-to-reset.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Matthew Auld <[email protected]>
Date: Mon, 28 Nov 2016 10:36:48 +0000
Subject: drm/i915: drop the struct_mutex when wedged or trying to reset

From: Matthew Auld <[email protected]>

commit e411072d5740a49cdc9d0713798c30440757e451 upstream.

We grab the struct_mutex in intel_crtc_page_flip, but if we are wedged or a reset is in progress we bail early but never seem to actually release the lock.

---
 drivers/gpu/drm/i915/intel_display.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -11791,7 +11791,7 @@ static int intel_crtc_page_flip(struct d
 	intel_crtc->reset_counter = i915_reset_counter(&dev_priv->gpu_error);
 	if (__i915_reset_in_progress_or_wedged(intel_crtc->reset_counter)) {
 		ret = -EIO;
-		goto cleanup;
+		goto unlock;
 	}
 
 	atomic_inc(&intel_crtc->unpin_work_count);

@@ -11877,6 +11877,7 @@ cleanup_pending:
 	if (!IS_ERR_OR_NULL(request))
 		i915_add_request_no_flush(request);
 	atomic_dec(&intel_crtc->unpin_work_count);
+unlock:
 	mutex_unlock(&dev->struct_mutex);
 cleanup:
 	crtc->primary->fb = old_fb;

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/drm-i915-don-t-touch-null-sg-on-i915_gem_object_get_pages_gtt-error.patch queue-4.8/drm-i915-drop-the-struct_mutex-when-wedged-or-trying-to-reset.patch