---

yaml --- r: 263014 b: refs/heads/master c: 92b79f4 h: refs/heads/master v: v3
git-mirror · Aug 15, 2011 · 4ac123f · 4ac123f
1 parent 83c8a63
commit 4ac123f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3613de92ebea302137d21d8938421c3f88d8741
+refs/heads/master: 92b79f4322b8a2506bdd862f554a2a81ff0a2dad
diff --git a/trunk/drivers/gpu/drm/i915/i915_suspend.c b/trunk/drivers/gpu/drm/i915/i915_suspend.c
@@ -871,7 +871,8 @@ int i915_restore_state(struct drm_device *dev)
 	}
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_init_clock_gating(dev);
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		intel_init_clock_gating(dev);
 
 	if (IS_IRONLAKE_M(dev)) {
 		ironlake_enable_drps(dev);