[Intel-gfx] [PATCH] drm/i915/selftests: Catch error from mock_file()

[Tvrtko Ursulin]

On 13/03/2017 12:47, Chris Wilson wrote:
> The patch 791ff39ae32a: "drm/i915: Live testing for context
> execution" from Feb 13, 2017, leads to the following static checker
> warning:
>
>         drivers/gpu/drm/i915/selftests/i915_gem_context.c:347 igt_ctx_exec()
>         error: 'file' dereferencing possible ERR_PTR()
>
> Reported-by: Dan Carpenter <dan.carpenter at oracle.com>
> Fixes: 791ff39ae32a ("drm/i915: Live testing for context execution")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Matthew Auld <matthew.auld at intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Mika Kuoppala <mika.kuoppala at intel.com>
> Cc: <drm-intel-fixes at lists.freedesktop.org>
> ---
>  drivers/gpu/drm/i915/selftests/i915_gem_context.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> index 3813a19a6179..1afb8b06e3e1 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> @@ -320,8 +320,8 @@ static unsigned long max_dwords(struct drm_i915_gem_object *obj)
>  static int igt_ctx_exec(void *arg)
>  {
>  	struct drm_i915_private *i915 = arg;
> -	struct drm_file *file = mock_file(i915);
>  	struct drm_i915_gem_object *obj;
> +	struct drm_file *file;
>  	IGT_TIMEOUT(end_time);
>  	LIST_HEAD(objects);
>  	unsigned long ncontexts, ndwords, dw;
> @@ -333,6 +333,10 @@ static int igt_ctx_exec(void *arg)
>  	 * up in the expected pages of our obj.
>  	 */
>
> +	file = mock_file(i915);
> +	if (IS_ERR(file))
> +		return PTR_ERR(file);
> +
>  	mutex_lock(&i915->drm.struct_mutex);
>
>  	ncontexts = 0;
>

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

Regards,

Tvrtko