From e48b784c03038b526f69bf7e2ddca65a4297b974 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 8 Dec 2010 14:26:19 +0000
Subject: [PATCH] --- yaml --- r: 228799 b: refs/heads/master c:
 d1c3b177b9940541e89015a726ac279caf1a21f3 h: refs/heads/master i:   228797:
 b26a77b81cff15430c60010b13a424e7836205ee   228795:
 84849e6cfcb057bb08c3c8a995335b0551a97a7b   228791:
 3aefbd503e455ec9d4466c8217214fa32e613ef6   228783:
 119f6cea654daa21e872edc0df2df30ac0dbcec9   228767:
 96888c20e5bed6f2131ea0a531d3c640db27aefd   228735:
 224f15a7f402aaa96421cf33758a0b760e2a55df v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0be384725518..91b5568632dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a19d02e0a8cd8799e5d150d8eb74861e1a4cdec
+refs/heads/master: d1c3b177b9940541e89015a726ac279caf1a21f3
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index ad28b21f4d03..2be344a8e93b 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -304,13 +304,18 @@ static int i915_drm_thaw(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int error = 0;
 
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		mutex_lock(&dev->struct_mutex);
+		i915_gem_restore_gtt_mappings(dev);
+		mutex_unlock(&dev->struct_mutex);
+	}
+
 	i915_restore_state(dev);
 	intel_opregion_setup(dev);
 
 	/* KMS EnterVT equivalent */
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 		mutex_lock(&dev->struct_mutex);
-		i915_gem_restore_gtt_mappings(dev);
 		dev_priv->mm.suspended = 0;
 
 		error = i915_gem_init_ringbuffer(dev);