[Intel-gfx] [PATCH 19/34] drm/i915: Tidy common test_bit probing of i915_request->fence.flags

[Tvrtko Ursulin]

On 21/01/2019 22:21, Chris Wilson wrote:
> A repeated pattern is to test the signaled bit of our
> request->fence.flags. Make this an inline to shorten a few lines and
> remove unnecessary line continuations.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/i915_irq.c          | 3 +--
>   drivers/gpu/drm/i915/i915_request.c      | 2 +-
>   drivers/gpu/drm/i915/i915_request.h      | 5 +++++
>   drivers/gpu/drm/i915/intel_breadcrumbs.c | 3 +--
>   drivers/gpu/drm/i915/intel_lrc.c         | 2 +-
>   drivers/gpu/drm/i915/intel_pm.c          | 2 +-
>   drivers/gpu/drm/i915/intel_ringbuffer.c  | 3 +--
>   7 files changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 1abfc3fa76ad..5fd5080c4ccb 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1182,8 +1182,7 @@ static void notify_ring(struct intel_engine_cs *engine)
>   			struct i915_request *waiter = wait->request;
>   
>   			if (waiter &&
> -			    !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT,
> -				      &waiter->fence.flags) &&
> +			    !i915_request_signaled(waiter) &&
>   			    intel_wait_check_request(wait, waiter))
>   				rq = i915_request_get(waiter);
>   
> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> index 80232de8e2be..2721a356368f 100644
> --- a/drivers/gpu/drm/i915/i915_request.c
> +++ b/drivers/gpu/drm/i915/i915_request.c
> @@ -198,7 +198,7 @@ static void __retire_engine_request(struct intel_engine_cs *engine,
>   	spin_unlock(&engine->timeline.lock);
>   
>   	spin_lock(&rq->lock);
> -	if (!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &rq->fence.flags))
> +	if (!i915_request_signaled(rq))
>   		dma_fence_signal_locked(&rq->fence);
>   	if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, &rq->fence.flags))
>   		intel_engine_cancel_signaling(rq);
> diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h
> index d014b0605445..c0f084ca4f29 100644
> --- a/drivers/gpu/drm/i915/i915_request.h
> +++ b/drivers/gpu/drm/i915/i915_request.h
> @@ -280,6 +280,11 @@ long i915_request_wait(struct i915_request *rq,
>   #define I915_WAIT_ALL		BIT(3) /* used by i915_gem_object_wait() */
>   #define I915_WAIT_FOR_IDLE_BOOST BIT(4)
>   
> +static inline bool i915_request_signaled(const struct i915_request *rq)
> +{
> +	return test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &rq->fence.flags);
> +}
> +
>   static inline bool intel_engine_has_started(struct intel_engine_cs *engine,
>   					    u32 seqno);
>   static inline bool intel_engine_has_completed(struct intel_engine_cs *engine,
> diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> index 4fad93fe3678..b58915b8708b 100644
> --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> @@ -631,8 +631,7 @@ static int intel_breadcrumbs_signaler(void *arg)
>   				rq->signaling.wait.seqno = 0;
>   				__list_del_entry(&rq->signaling.link);
>   
> -				if (!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT,
> -					      &rq->fence.flags)) {
> +				if (!i915_request_signaled(rq)) {
>   					list_add_tail(&rq->signaling.link,
>   						      &list);
>   					i915_request_get(rq);
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index bc65d8006e16..464dd309fa99 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -855,7 +855,7 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)
>   	list_for_each_entry(rq, &engine->timeline.requests, link) {
>   		GEM_BUG_ON(!rq->global_seqno);
>   
> -		if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &rq->fence.flags))
> +		if (i915_request_signaled(rq))
>   			continue;
>   
>   		dma_fence_set_error(&rq->fence, -EIO);
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8b63afa3a221..fdc28a3d2936 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -6662,7 +6662,7 @@ void gen6_rps_boost(struct i915_request *rq,
>   	if (!rps->enabled)
>   		return;
>   
> -	if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &rq->fence.flags))
> +	if (i915_request_signaled(rq))
>   		return;
>   
>   	/* Serializes with i915_request_retire() */
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 66dc8e2fa353..bc620ae297b4 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -876,8 +876,7 @@ static void cancel_requests(struct intel_engine_cs *engine)
>   	list_for_each_entry(request, &engine->timeline.requests, link) {
>   		GEM_BUG_ON(!request->global_seqno);
>   
> -		if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT,
> -			     &request->fence.flags))
> +		if (i915_request_signaled(request))
>   			continue;
>   
>   		dma_fence_set_error(&request->fence, -EIO);
> 

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

Regards,

Tvrtko