Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3d34b54..269ba83 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -731,6 +731,8 @@ int i915_reset(struct drm_device *dev) if (!i915_try_reset) return 0; + intel_modeset_quiesce(dev); /* finish off any pending tasks first */ + mutex_lock(&dev->struct_mutex); i915_gem_reset(dev); -- 1.7.10.4
