summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@intel.com>2015-03-17 14:51:58 +0200
committerMika Kuoppala <mika.kuoppala@intel.com>2015-03-17 17:46:30 +0200
commit2f25bf70bb64e818f3ca9307b7581cbdd6ca83e9 (patch)
tree8de901e3c1bdd6a568276f413de377f92bca473d
parenta1942108a13f7ab07efd35e19c94a5c04ba7986f (diff)
drm/i915: Stop rings before cleaning up on resetring_hw_init
We want to ensure that the hardware is stopped before we analyse and cleanup the request queue. Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 5636351fe5f6..051642cf44d6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2752,6 +2752,8 @@ void i915_gem_reset(struct drm_device *dev)
struct intel_engine_cs *ring;
int i;
+ i915_gem_stop_ringbuffers(dev);
+
/*
* Before we free the objects from the requests, we need to inspect
* them for finding the guilty party. As the requests only borrow