drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
authorEric Anholt <eric@anholt.net>
Thu, 22 Jan 2009 17:56:58 +0000 (09:56 -0800)
committerDave Airlie <airlied@linux.ie>
Sun, 8 Feb 2009 11:37:41 +0000 (21:37 +1000)
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>
drivers/gpu/drm/i915/i915_gem.c

index debad5c04cc01d8f4ea70d1efcdd746ff40fe841..a590d61ff692e2d9ca46edc01e3f6c9b7b7402a4 100644 (file)
@@ -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);