drm/i915: Correct locking in the modesetting failure path, fixing a B…

…UG_ON. Signed-off-by: Eric Anholt <eric@anholt.net>
git-mirror · Feb 26, 2010 · 2109953 · 2109953
1 parent c2416fc
commit 2109953
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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;
 }