drm/xe: Use a define to set initial seqno for fences

Also for HW fences, write the initial seqno - 1 to the HW completed
seqno to initialize.

v2:
- Use __dma_fence_is_later() to compare hw fence seqnos. (Matthew Auld)

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_engine.c b/drivers/gpu/drm/xe/xe_engine.c
index 3e40fb6..edd1192 100644 (file)
--- a/drivers/gpu/drm/xe/xe_engine.c
+++ b/drivers/gpu/drm/xe/xe_engine.c
@@ -13,6 +13,7 @@
 
 #include "xe_device.h"
 #include "xe_gt.h"
+#include "xe_hw_fence.h"
 #include "xe_lrc.h"
 #include "xe_macros.h"
 #include "xe_migrate.h"
@@ -57,11 +58,11 @@ static struct xe_engine *__xe_engine_create(struct xe_device *xe,
 
        if (xe_engine_is_parallel(e)) {
                e->parallel.composite_fence_ctx = dma_fence_context_alloc(1);
-               e->parallel.composite_fence_seqno = 1;
+               e->parallel.composite_fence_seqno = XE_FENCE_INITIAL_SEQNO;
        }
        if (e->flags & ENGINE_FLAG_VM) {
                e->bind.fence_ctx = dma_fence_context_alloc(1);
-               e->bind.fence_seqno = 1;
+               e->bind.fence_seqno = XE_FENCE_INITIAL_SEQNO;
        }
 
        for (i = 0; i < width; ++i) {

diff --git a/drivers/gpu/drm/xe/xe_hw_fence.c b/drivers/gpu/drm/xe/xe_hw_fence.c
index e56ca28..ffe1a39 100644 (file)
--- a/drivers/gpu/drm/xe/xe_hw_fence.c
+++ b/drivers/gpu/drm/xe/xe_hw_fence.c
@@ -129,7 +129,7 @@ void xe_hw_fence_ctx_init(struct xe_hw_fence_ctx *ctx, struct xe_gt *gt,
        ctx->gt = gt;
        ctx->irq = irq;
        ctx->dma_fence_ctx = dma_fence_context_alloc(1);
-       ctx->next_seqno = 1;
+       ctx->next_seqno = XE_FENCE_INITIAL_SEQNO;
        sprintf(ctx->name, "%s", name);
 }
 
@@ -165,7 +165,7 @@ static bool xe_hw_fence_signaled(struct dma_fence *dma_fence)
        u32 seqno = xe_map_rd(xe, &fence->seqno_map, 0, u32);
 
        return dma_fence->error ||
-               (s32)fence->dma.seqno <= (s32)seqno;
+               !__dma_fence_is_later(dma_fence->seqno, seqno, dma_fence->ops);
 }
 
 static bool xe_hw_fence_enable_signaling(struct dma_fence *dma_fence)

diff --git a/drivers/gpu/drm/xe/xe_hw_fence.h b/drivers/gpu/drm/xe/xe_hw_fence.h
index 07f202d..523c261 100644 (file)
--- a/drivers/gpu/drm/xe/xe_hw_fence.h
+++ b/drivers/gpu/drm/xe/xe_hw_fence.h
@@ -8,6 +8,8 @@
 
 #include "xe_hw_fence_types.h"
 
+#define XE_FENCE_INITIAL_SEQNO 1
+
 int xe_hw_fence_module_init(void);
 void xe_hw_fence_module_exit(void);
 

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 9140b05..fb8c6f7 100644 (file)
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -697,6 +697,9 @@ int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe,
        arb_enable = MI_ARB_ON_OFF | MI_ARB_ENABLE;
        xe_lrc_write_ring(lrc, &arb_enable, sizeof(arb_enable));
 
+       map = __xe_lrc_seqno_map(lrc);
+       xe_map_write32(lrc_to_xe(lrc), &map, lrc->fence_ctx.next_seqno - 1);
+
        return 0;
 
 err_lrc_finish: