[Intel-gfx] [PATCH] drm/i915: Drop bool return from breadcrumbs signaler

Tvrtko Ursulin tvrtko.ursulin at linux.intel.com
Tue Apr 16 09:07:45 UTC 2019


On 16/04/2019 09:52, Chris Wilson wrote:
> Since removal of the "missed interrupt detection" bobody used the result
> of whether or not we signaled anybody during that invocation, so now
> remove the return value.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_breadcrumbs.c | 14 +++-----------
>   drivers/gpu/drm/i915/intel_ringbuffer.h  |  4 ++--
>   2 files changed, 5 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> index 09ed90c0ba00..3cbffd400b1b 100644
> --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> @@ -27,8 +27,6 @@
>   
>   #include "i915_drv.h"
>   
> -#define task_asleep(tsk) ((tsk)->state & TASK_NORMAL && !(tsk)->on_rq)
> -
>   static void irq_enable(struct intel_engine_cs *engine)
>   {
>   	if (!engine->irq_enable)
> @@ -82,7 +80,7 @@ static inline bool __request_completed(const struct i915_request *rq)
>   	return i915_seqno_passed(__hwsp_seqno(rq), rq->fence.seqno);
>   }
>   
> -bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine)
> +void intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine)
>   {
>   	struct intel_breadcrumbs *b = &engine->breadcrumbs;
>   	struct intel_context *ce, *cn;
> @@ -146,19 +144,13 @@ bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine)
>   		dma_fence_signal(&rq->fence);
>   		i915_request_put(rq);
>   	}
> -
> -	return !list_empty(&signal);
>   }
>   
> -bool intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine)
> +void intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine)
>   {
> -	bool result;
> -
>   	local_irq_disable();
> -	result = intel_engine_breadcrumbs_irq(engine);
> +	intel_engine_breadcrumbs_irq(engine);
>   	local_irq_enable();
> -
> -	return result;
>   }
>   
>   static void signal_irq_work(struct irq_work *work)
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 4b33e88eabb1..72c7c337ace9 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -388,7 +388,7 @@ void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine);
>   void intel_engine_pin_breadcrumbs_irq(struct intel_engine_cs *engine);
>   void intel_engine_unpin_breadcrumbs_irq(struct intel_engine_cs *engine);
>   
> -bool intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine);
> +void intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine);
>   void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine);
>   
>   static inline void
> @@ -397,7 +397,7 @@ intel_engine_queue_breadcrumbs(struct intel_engine_cs *engine)
>   	irq_work_queue(&engine->breadcrumbs.irq_work);
>   }
>   
> -bool intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine);
> +void intel_engine_breadcrumbs_irq(struct intel_engine_cs *engine);
>   
>   void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine);
>   void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine);
> 

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

Regards,

Tvrtko


More information about the Intel-gfx mailing list