From: Eric Anholt <eric@anholt.net>
Date: Thu, 22 Jan 2009 17:56:58 +0000 (-0800)
Subject: drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e806b4957412bf472d826bd8cc571da041248799;p=linux-beck.git

drm/i915: Suppress GEM teardown on X Server exit in KMS mode.

Fixes hangs when starting X for the second time.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index debad5c04cc0..a590d61ff692 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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);