[2/2] drm/i915: Finish pending tasks before doing a reset
diff mbox

Message ID 1343070574-23917-2-git-send-email-chris@chris-wilson.co.uk
State New, archived
Headers show

Commit Message

Chris Wilson July 23, 2012, 7:09 p.m. UTC
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_drv.c |    2 ++
 1 file changed, 2 insertions(+)

Patch
diff mbox

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