Commit 4803f6e2 authored by Matthew Auld's avatar Matthew Auld Committed by Rodrigo Vivi
Browse files

drm/xe/tlb: increment next seqno after successful CT send 



If we are in the middle of a GT reset or similar the CT might be
disabled, such that the CT send fails. However we already incremented
gt->tlb_invalidation.seqno which might lead to warnings, since we
effectively just skipped a seqno:

    0000:00:02.0: drm_WARN_ON(expected_seqno != msg[0])

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent dad33831

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

+6 −5
Original line number Diff line number Diff line
@@ -124,10 +124,6 @@ static int send_tlb_invalidation(struct xe_guc *guc, 
		trace_xe_gt_tlb_invalidation_fence_send(fence);

	}

	action[1] = seqno;

	gt->tlb_invalidation.seqno = (gt->tlb_invalidation.seqno + 1) %

		TLB_INVALIDATION_SEQNO_MAX;

	if (!gt->tlb_invalidation.seqno)

		gt->tlb_invalidation.seqno = 1;

	ret = xe_guc_ct_send_locked(&guc->ct, action, len,

				    G2H_LEN_DW_TLB_INVALIDATE, 1);

	if (!ret && fence) {
@@ -137,8 +133,13 @@ static int send_tlb_invalidation(struct xe_guc *guc, 
					   &gt->tlb_invalidation.fence_tdr,

					   TLB_TIMEOUT);

	}

	if (!ret)

	if (!ret) {

		gt->tlb_invalidation.seqno = (gt->tlb_invalidation.seqno + 1) %

			TLB_INVALIDATION_SEQNO_MAX;

		if (!gt->tlb_invalidation.seqno)

			gt->tlb_invalidation.seqno = 1;

		ret = seqno;

	}

	if (ret < 0 && fence)

		invalidation_fence_signal(fence);

	mutex_unlock(&guc->ct.lock);