Skip to content

Commit

Permalink
drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Anholt authored and Dave Airlie committed Feb 8, 2009
1 parent 9b8d5a1 commit e806b49
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e806b49

Please sign in to comment.