On Fri, Oct 11, 2013 at 11:14 AM, Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> wrote: > > void > @@ -4711,11 +4707,9 @@ i915_gem_lastclose(struct drm_device *dev) > if (drm_core_check_feature(dev, DRIVER_MODESET)) > return; > > - mutex_lock(&dev->struct_mutex); > - ret = i915_gem_idle(dev); > + ret = i915_gem_idle(dev, false); I think this here should also set disable=true, in case X died prematurely and forgot to do the leavevt dance. At that point I think we could rip out that disable parameter again and just set it when in ums mode. Also this change should be in a separate patch, at least I don't understand why we need to change it here together with the untangling of the gpu_idle/gem_idle confusion. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx