Commit e1c31fb5 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Merge i915_request.flags with i915_request.fence.flags 



As we already have a flags field buried within i915_request, reuse it!

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200106114234.2529613-3-chris@chris-wilson.co.uk
parent 6d728d92

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2173,7 +2173,7 @@ static int eb_submit(struct i915_execbuffer *eb) 
	}

	}





	if (intel_context_nopreempt(eb->context))

	if (intel_context_nopreempt(eb->context))

		eb->request->flags |= I915_REQUEST_NOPREEMPT;

		__set_bit(I915_FENCE_FLAG_NOPREEMPT, &eb->request->fence.flags);





	return 0;

	return 0;

}

}

drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ int intel_engine_pulse(struct intel_engine_cs *engine) 
		goto out_unlock;

		goto out_unlock;

	}

	}





	rq->flags |= I915_REQUEST_SENTINEL;

	__set_bit(I915_FENCE_FLAG_SENTINEL, &rq->fence.flags);

	idle_pulse(engine, rq);

	idle_pulse(engine, rq);





	__i915_request_commit(rq);

	__i915_request_commit(rq);

drivers/gpu/drm/i915/gt/intel_lrc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1538,8 +1538,8 @@ static bool can_merge_rq(const struct i915_request *prev, 
	if (i915_request_completed(next))

	if (i915_request_completed(next))

		return true;

		return true;





	if (unlikely((prev->flags ^ next->flags) &

	if (unlikely((prev->fence.flags ^ next->fence.flags) &

		     (I915_REQUEST_NOPREEMPT | I915_REQUEST_SENTINEL)))

		     (I915_FENCE_FLAG_NOPREEMPT | I915_FENCE_FLAG_SENTINEL)))

		return false;

		return false;





	if (!can_merge_ctx(prev->context, next->context))

	if (!can_merge_ctx(prev->context, next->context))

drivers/gpu/drm/i915/gt/intel_rps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -777,7 +777,7 @@ void intel_rps_boost(struct i915_request *rq) 
	spin_lock_irqsave(&rq->lock, flags);

	spin_lock_irqsave(&rq->lock, flags);

	if (!i915_request_has_waitboost(rq) &&

	if (!i915_request_has_waitboost(rq) &&

	    !dma_fence_is_signaled_locked(&rq->fence)) {

	    !dma_fence_is_signaled_locked(&rq->fence)) {

		rq->flags |= I915_REQUEST_WAITBOOST;

		set_bit(I915_FENCE_FLAG_BOOST, &rq->fence.flags);





		if (!atomic_fetch_inc(&rps->num_waiters) &&

		if (!atomic_fetch_inc(&rps->num_waiters) &&

		    READ_ONCE(rps->cur_freq) < rps->boost_freq)

		    READ_ONCE(rps->cur_freq) < rps->boost_freq)

drivers/gpu/drm/i915/gt/selftest_lrc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1153,7 +1153,7 @@ static int live_nopreempt(void *arg) 
		}

		}





		/* Low priority client, but unpreemptable! */

		/* Low priority client, but unpreemptable! */

		rq_a->flags |= I915_REQUEST_NOPREEMPT;

		__set_bit(I915_FENCE_FLAG_NOPREEMPT, &rq_a->fence.flags);





		i915_request_add(rq_a);

		i915_request_add(rq_a);

		if (!igt_wait_for_spinner(&a.spin, rq_a)) {

		if (!igt_wait_for_spinner(&a.spin, rq_a)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE