Commit 8f922e42 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Daniel Vetter
Browse files

drm/i915: Restrict sentinel requests further 



Disallow sentinel requests follow previous sentinels to make request
cancellation work better when faced with a chain of requests which have
all been marked as in error.

Because in cases where we end up with a stream of cancelled requests we
want to turn off request coalescing so they each will get individually
skipped by the execlists_schedule_in (which is called per ELSP port, not
per request).

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
[danvet: Fix typo in the commit message that Matthew spotted.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-4-tvrtko.ursulin@linux.intel.com
parent 38b237ea

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

+1 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ static bool can_merge_rq(const struct i915_request *prev, 
	if (__i915_request_is_complete(next))

		return true;



	if (unlikely((i915_request_flags(prev) ^ i915_request_flags(next)) &

	if (unlikely((i915_request_flags(prev) | i915_request_flags(next)) &

		     (BIT(I915_FENCE_FLAG_NOPREEMPT) |

		      BIT(I915_FENCE_FLAG_SENTINEL))))

		return false;