[Intel-gfx] [PATCH 3/3] drm/i915/selftests: Provide stub reset functions

Mika Kuoppala mika.kuoppala at linux.intel.com
Wed Mar 20 08:55:54 UTC 2019


Chris Wilson <chris at chris-wilson.co.uk> writes:

> If a test fails, we quite often mark the device as wedged. Provide the
> stub functions so that we can wedge the mock device, and avoid exploding
> on test failures.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109981
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>

Reviewed-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/selftests/mock_engine.c | 36 ++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c
> index 639d36eb904a..61744819172b 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_engine.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_engine.c
> @@ -198,6 +198,37 @@ static void mock_submit_request(struct i915_request *request)
>  	spin_unlock_irqrestore(&engine->hw_lock, flags);
>  }
>  
> +static void mock_reset_prepare(struct intel_engine_cs *engine)
> +{
> +}
> +
> +static void mock_reset(struct intel_engine_cs *engine, bool stalled)
> +{
> +	GEM_BUG_ON(stalled);
> +}
> +
> +static void mock_reset_finish(struct intel_engine_cs *engine)
> +{
> +}
> +
> +static void mock_cancel_requests(struct intel_engine_cs *engine)
> +{
> +	struct i915_request *request;
> +	unsigned long flags;
> +
> +	spin_lock_irqsave(&engine->timeline.lock, flags);
> +
> +	/* Mark all submitted requests as skipped. */
> +	list_for_each_entry(request, &engine->timeline.requests, sched.link) {
> +		if (!i915_request_signaled(request))
> +			dma_fence_set_error(&request->fence, -EIO);
> +
> +		i915_request_mark_complete(request);
> +	}
> +
> +	spin_unlock_irqrestore(&engine->timeline.lock, flags);
> +}
> +
>  struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
>  				    const char *name,
>  				    int id)
> @@ -223,6 +254,11 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
>  	engine->base.emit_fini_breadcrumb = mock_emit_breadcrumb;
>  	engine->base.submit_request = mock_submit_request;
>  
> +	engine->base.reset.prepare = mock_reset_prepare;
> +	engine->base.reset.reset = mock_reset;
> +	engine->base.reset.finish = mock_reset_finish;
> +	engine->base.cancel_requests = mock_cancel_requests;
> +
>  	if (i915_timeline_init(i915,
>  			       &engine->base.timeline,
>  			       engine->base.name,
> -- 
> 2.20.1


More information about the Intel-gfx mailing list