[Intel-gfx] [PATCH 12/37] drm/i915: Add a simple request selftest for waiting

[Tvrtko Ursulin]

On 11/01/2017 21:09, Chris Wilson wrote:
> A trivial kselftest to submit a request and wait upon it.

Hm this should have been a v2!

> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/selftests/i915_gem_request.c | 44 +++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_request.c b/drivers/gpu/drm/i915/selftests/i915_gem_request.c
> index 233c0bdb9e82..ef72b32f9bc3 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_request.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_request.c
> @@ -47,10 +47,54 @@ static int igt_add_request(void *arg)
>  	return err;
>  }
>
> +static int igt_wait_request(void *arg)
> +{
> +	const long T = HZ / 4;
> +	struct drm_i915_private *i915 = arg;
> +	struct drm_i915_gem_request *request;
> +	int err = -EINVAL;
> +
> +	mutex_lock(&i915->drm.struct_mutex);
> +	request = mock_request(i915->engine[RCS], i915->kernel_context, T);
> +	if (!request) {
> +		err = -ENOMEM;
> +		goto out_unlock;
> +	}
> +
> +	i915_add_request(request);
> +
> +	if (i915_gem_request_completed(request)) {
> +		pr_err("request completed immediately!\n");
> +		goto out_unlock;
> +	}
> +
> +	if (i915_wait_request(request, I915_WAIT_LOCKED, T / 2) != -ETIME) {
> +		pr_err("request wait succeeded (expected tiemout!)\n");
> +		goto out_unlock;
> +	}
> +
> +	if (i915_wait_request(request, I915_WAIT_LOCKED, T) == -ETIME) {
> +		pr_err("request wait timed out!\n");
> +		goto out_unlock;
> +	}
> +
> +	if (!i915_gem_request_completed(request)) {
> +		pr_err("request not complete after waiting!\n");
> +		goto out_unlock;
> +	}
> +
> +	err = 0;
> +out_unlock:
> +	mock_device_flush(i915);
> +	mutex_unlock(&i915->drm.struct_mutex);
> +	return err;
> +}
> +
>  int i915_gem_request_mock_selftests(void)
>  {
>  	static const struct i915_subtest tests[] = {
>  		SUBTEST(igt_add_request),
> +		SUBTEST(igt_wait_request),
>  	};
>  	struct drm_i915_private *i915;
>  	int err;
>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko