[Intel-gfx] [PATCH v2 1/3] drm/i915/userptr: Deactivate a failed userptr if the worker reports an EFAULT

Tvrtko Ursulin tvrtko.ursulin at linux.intel.com
Wed Mar 8 08:02:24 UTC 2017


On 07/03/2017 20:58, Chris Wilson wrote:
> If the worker fails, it no longer has pages to release and can be
> immediately removed from the invalidate-tree.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_userptr.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
> index 22b46398831e..6ef05d5b884d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_userptr.c
> +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
> @@ -541,6 +541,8 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
>  		}
>
>  		obj->userptr.work = ERR_CAST(pages);
> +		if (IS_ERR(pages))
> +			__i915_gem_userptr_set_active(obj, false);
>  	}
>  	mutex_unlock(&obj->mm.lock);
>
>

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

Regards,

Tvrtko


More information about the Intel-gfx mailing list