From: Chris Wilson Date: Fri, 27 Sep 2019 21:17:49 +0000 (+0100) Subject: drm/i915/selftests: Provide a mock GPU reset routine X-Git-Tag: for-linus-20191205~71^2~33^2~50 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4abc6e7c917b1929d8fad2c2364b270cae5ed4ca;p=linux-2.6-block.git drm/i915/selftests: Provide a mock GPU reset routine For those mock tests that may wish to pretend triggering a GPU reset and processing the cleanup. Signed-off-by: Chris Wilson Cc: Andi Shyti Reviewed-by: Andi Shyti Link: https://patchwork.freedesktop.org/patch/msgid/20190927211749.2181-3-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index ea5cf3a28fbe..76938fa3a1b9 100644 --- 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;