Commit e806b495 authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie

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

Fixes hangs when starting X for the second time.
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 9b8d5a12
...@@ -3273,6 +3273,9 @@ i915_gem_lastclose(struct drm_device *dev) ...@@ -3273,6 +3273,9 @@ i915_gem_lastclose(struct drm_device *dev)
{ {
int ret; int ret;
if (drm_core_check_feature(dev, DRIVER_MODESET))
return;
ret = i915_gem_idle(dev); ret = i915_gem_idle(dev);
if (ret) if (ret)
DRM_ERROR("failed to idle hardware: %d\n", ret); DRM_ERROR("failed to idle hardware: %d\n", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment