From 4ac123fe5611138355f5da99acd636c7478f4f34 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 12 Aug 2011 17:07:18 -0700
Subject: [PATCH] --- yaml --- r: 263014 b: refs/heads/master c:
 92b79f4322b8a2506bdd862f554a2a81ff0a2dad h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b6f1477b8bcd..0cef15b69b01 100644
--- 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
index 87677d60d0df..f10742359ec9 100644
--- 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);