[Intel-gfx] [PATCH 3/5] drm/i915: Drop error handling from dma_fence_work

[Daniel Vetter]

Commit message missing here, something like "With fence error propagation
gone and the cmd parse being sync again all users of this disappeared".


On Wed, Jun 02, 2021 at 11:41:47AM -0500, Jason Ekstrand wrote:
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> Reviewed-by: Jon Bloomfield <jon.bloomfield at intel.com>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 4 +---
>  drivers/gpu/drm/i915/i915_sw_fence_work.c   | 5 +----
>  drivers/gpu/drm/i915/i915_sw_fence_work.h   | 2 +-
>  drivers/gpu/drm/i915/i915_vma.c             | 3 +--
>  4 files changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> index daf9284ef1f54..f0435c6feb68b 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> @@ -24,13 +24,11 @@ static void __do_clflush(struct drm_i915_gem_object *obj)
>  	i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);
>  }
>  
> -static int clflush_work(struct dma_fence_work *base)
> +static void clflush_work(struct dma_fence_work *base)
>  {
>  	struct clflush *clflush = container_of(base, typeof(*clflush), base);
>  
>  	__do_clflush(clflush->obj);
> -
> -	return 0;
>  }
>  
>  static void clflush_release(struct dma_fence_work *base)
> diff --git a/drivers/gpu/drm/i915/i915_sw_fence_work.c b/drivers/gpu/drm/i915/i915_sw_fence_work.c
> index a3a81bb8f2c36..5b33ef23d54c9 100644
> --- a/drivers/gpu/drm/i915/i915_sw_fence_work.c
> +++ b/drivers/gpu/drm/i915/i915_sw_fence_work.c
> @@ -16,11 +16,8 @@ static void fence_complete(struct dma_fence_work *f)
>  static void fence_work(struct work_struct *work)
>  {
>  	struct dma_fence_work *f = container_of(work, typeof(*f), work);
> -	int err;
>  
> -	err = f->ops->work(f);
> -	if (err)
> -		dma_fence_set_error(&f->dma, err);
> +	f->ops->work(f);
>  
>  	fence_complete(f);
>  	dma_fence_put(&f->dma);
> diff --git a/drivers/gpu/drm/i915/i915_sw_fence_work.h b/drivers/gpu/drm/i915/i915_sw_fence_work.h
> index 2c409f11c5c59..d56806918d131 100644
> --- a/drivers/gpu/drm/i915/i915_sw_fence_work.h
> +++ b/drivers/gpu/drm/i915/i915_sw_fence_work.h
> @@ -17,7 +17,7 @@ struct dma_fence_work;
>  
>  struct dma_fence_work_ops {
>  	const char *name;
> -	int (*work)(struct dma_fence_work *f);
> +	void (*work)(struct dma_fence_work *f);
>  	void (*release)(struct dma_fence_work *f);
>  };
>  
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index a6cd0fa628477..03cdaa0f459ba 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -300,14 +300,13 @@ struct i915_vma_work {
>  	unsigned int flags;
>  };
>  
> -static int __vma_bind(struct dma_fence_work *work)
> +static void __vma_bind(struct dma_fence_work *work)
>  {
>  	struct i915_vma_work *vw = container_of(work, typeof(*vw), base);
>  	struct i915_vma *vma = vw->vma;
>  
>  	vma->ops->bind_vma(vw->vm, &vw->stash,
>  			   vma, vw->cache_level, vw->flags);
> -	return 0;
>  }
>  
>  static void __vma_release(struct dma_fence_work *work)
> -- 
> 2.31.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch