[Intel-gfx] [PATCH] Fix NULL pointer found by static analysis

[Chris Wilson]

Quoting Steve Hampson (2020-09-23 05:40:54)
> A static analysis tool has reveiled a NULL pointer error in
> __i915_gem_object_lock.  This appears to be correct as many calls
> pass a NULL into the ww parameter.
> 
> Signed-off-by: Steve Hampson <steven.t.hampson at intel.com>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> index d46db8d8f38e..9b18ead42991 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> @@ -126,7 +126,7 @@ static inline int __i915_gem_object_lock(struct drm_i915_gem_object *obj,
>         if (ret == -EALREADY)
>                 ret = 0;
>  
> -       if (ret == -EDEADLK)
> +       if (ret == -EDEADLK && ww)

EDEADLK is predicated by ww already.
-Chris