diff options
| author |   Eric Anholt <eric@anholt.net> | 2009-01-22 09:56:58 -0800 |
|---|---|---|
| committer |   Dave Airlie <airlied@linux.ie> | 2009-02-08 21:37:41 +1000 |
| commit | e806b4957412bf472d826bd8cc571da041248799 (patch) | |
| tree | f74aa5cc7cd25a1ed3a066f9aefdd25affb50e63 | |
| parent | drm/radeon: fix ioremap conflict with AGP mappings (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index debad5c04cc0..a590d61ff692 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -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); |