Эх сурвалжийг харах

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>
Eric Anholt 16 жил өмнө
parent
commit
e806b49574

+ 3 - 0
drivers/gpu/drm/i915/i915_gem.c

@@ -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);