projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e18ca7
)
drm/i915/selftests: Provide a mock GPU reset routine
author
Chris Wilson
<chris@chris-wilson.co.uk>
Fri, 27 Sep 2019 21:17:49 +0000
(22:17 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Fri, 27 Sep 2019 22:25:46 +0000
(23:25 +0100)
For those mock tests that may wish to pretend triggering a GPU reset and
processing the cleanup.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20190927211749.2181-3-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_reset.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/gt/intel_reset.c
b/drivers/gpu/drm/i915/gt/intel_reset.c
index ea5cf3a28fbe20a085f49e383f1930df8759807a..76938fa3a1b9fd931b43002789bebdf4943ac964 100644
(file)
--- a/
drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/
drivers/gpu/drm/i915/gt/intel_reset.c
@@
-542,6
+542,13
@@
skip_reset:
return ret;
}
+static int mock_reset(struct intel_gt *gt,
+ intel_engine_mask_t mask,
+ unsigned int retry)
+{
+ return 0;
+}
+
typedef int (*reset_func)(struct intel_gt *,
intel_engine_mask_t engine_mask,
unsigned int retry);
@@
-550,7
+557,9
@@
static reset_func intel_get_gpu_reset(const struct intel_gt *gt)
{
struct drm_i915_private *i915 = gt->i915;
- if (INTEL_GEN(i915) >= 8)
+ if (is_mock_gt(gt))
+ return mock_reset;
+ else if (INTEL_GEN(i915) >= 8)
return gen8_reset_engines;
else if (INTEL_GEN(i915) >= 6)
return gen6_reset_engines;