From: Eric Anholt <eric@anholt.net>
Date: Mon, 9 Nov 2009 22:57:34 +0000 (-0800)
Subject: drm/i915: Correct locking in the modesetting failure path, fixing a BUG_ON.
X-Git-Tag: upstream/snapshot3+hdmi~14679^2~101^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21099537dbacc5c8999d833e6bfd1b72edd89189;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

drm/i915: Correct locking in the modesetting failure path, fixing a BUG_ON.

Signed-off-by: Eric Anholt <eric@anholt.net>
---

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 7bfded5..281faca 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1405,7 +1405,9 @@ static int i915_load_modeset_init(struct drm_device *dev,
 	return 0;
 
 destroy_ringbuffer:
+	mutex_lock(&dev->struct_mutex);
 	i915_gem_cleanup_ringbuffer(dev);
+	mutex_unlock(&dev->struct_mutex);
 out:
 	return ret;
 }