---

yaml --- r: 228799 b: refs/heads/master c: d1c3b17 h: refs/heads/master i: 228797: b26a77b 228795: 84849e6 228791: 3aefbd5 228783: 119f6ce 228767: 96888c2 228735: 224f15a v: v3
git-mirror · Dec 9, 2010 · e48b784 · e48b784
1 parent bb20e9d
commit e48b784
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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);