From 148591d705848c780f4746f81081ffe9fc39b834 Mon Sep 17 00:00:00 2001
From: Pierre Willenbrock <pierre@pirsoft.de>
Date: Mon, 23 Feb 2009 10:12:15 +1000
Subject: [PATCH] --- yaml --- r: 131682 b: refs/heads/master c:
 5004417d840e6dcb0052061fd04569b9c9f037a8 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 11af0586b1f5..35865385f9e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fb88588555a18792a27f483887fe1f2af5f9c9b
+refs/heads/master: 5004417d840e6dcb0052061fd04569b9c9f037a8
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 4d2baf7b00be..65b635ce28c8 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1008,6 +1008,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
 		temp = CURSOR_MODE_DISABLE;
 		addr = 0;
 		bo = NULL;
+		mutex_lock(&dev->struct_mutex);
 		goto finish;
 	}