summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorMichel Thierry <michel.thierry@intel.com>2017-06-20 10:57:48 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2017-06-20 21:00:22 +0100
commit702c8f8e5daba24777b29899fb9576fe64a924ea (patch)
treedc0b2837c9ec7a2d45e6ce29f286196e21e8d159 /drivers/gpu/drm/i915/i915_drv.c
parenta1ef70e144534777965426393dcaa1721e908e83 (diff)
downloadlinux-rt-702c8f8e5daba24777b29899fb9576fe64a924ea.tar.gz
drm/i915: Add engine reset count to error state
Driver maintains count of how many times a given engine is reset, useful to capture this in error state also. It gives an idea of how engine is coping up with the workloads it is executing before this error state. A follow-up patch will provide this information in debugfs. v2: s/engine_reset/reset_engine/ (Chris) Define count as unsigned int (Tvrtko) Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com> Signed-off-by: Michel Thierry <michel.thierry@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170615201828.23144-7-michel.thierry@intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/20170620095751.13127-7-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 2ecac000e5da..d35a114c46ed 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1971,7 +1971,10 @@ int i915_reset_engine(struct intel_engine_cs *engine)
* process to program RING_MODE, HWSP and re-enable submission.
*/
ret = engine->init_hw(engine);
+ if (ret)
+ goto out;
+ error->reset_engine_count[engine->id]++;
out:
return ret;
}