Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/i915/i915_gem.c

+3 −0
Original line number Diff line number Diff line
@@ -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);