From 543dfe03df33ec4521690112abb2ac5aaaae0587 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 22 Jan 2009 09:56:58 -0800
Subject: [PATCH] --- yaml --- r: 131137 b: refs/heads/master c:
 e806b4957412bf472d826bd8cc571da041248799 h: refs/heads/master i:   131135:
 d388d67bf479513b414b9bea80e65d1d2eae6ed6 v: v3

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

diff --git a/[refs] b/[refs]
index 93374396b781..d4c3266dbb9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b8d5a124f133fe9a75397d20b874844a2e3d7e9
+refs/heads/master: e806b4957412bf472d826bd8cc571da041248799
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index debad5c04cc0..a590d61ff692 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3273,6 +3273,9 @@ i915_gem_lastclose(struct drm_device *dev)
 {
 	int ret;
 
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		return;
+
 	ret = i915_gem_idle(dev);
 	if (ret)
 		DRM_ERROR("failed to idle hardware: %d\n", ret);