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: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
index 2b60251ea1c0f99f8f6efb23deed0f1d8be9037c..b4d024bf10be162aa5c58f951333707bf330ceb6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
+++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
@@ -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);