summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/xe/xe_migrate.c
diff options
context:
space:
mode:
authorThomas Hellström <thomas.hellstrom@linux.intel.com>2023-03-10 14:03:47 +0300
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-12-20 02:30:13 +0300
commit155c9165542863c97b5284afa37e3d8e385a8815 (patch)
tree4036dd40cff666f9f440d6a4bc47e7a64b8f5857 /drivers/gpu/drm/xe/xe_migrate.c
parent17a28ea23c4087cf4580744a70105ccc83efc769 (diff)
downloadlinux-155c9165542863c97b5284afa37e3d8e385a8815.tar.xz
drm/xe: Introduce xe_engine_is_idle()
Introduce xe_engine_is_idle, and replace the static function in xe_migrate.c. The latter had two flaws. First the seqno == 1 test might return a false true value each time the seqno counter wrapped, Second, the cur_seqno == next_seqno test would never return true. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_migrate.c')
-rw-r--r--drivers/gpu/drm/xe/xe_migrate.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 366892198d11..4a600c64b5d0 100644
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -1024,12 +1024,6 @@ static bool no_in_syncs(struct xe_sync_entry *syncs, u32 num_syncs)
return true;
}
-static bool engine_is_idle(struct xe_engine *e)
-{
- return !e || e->lrc[0].fence_ctx.next_seqno == 1 ||
- xe_lrc_seqno(&e->lrc[0]) == e->lrc[0].fence_ctx.next_seqno;
-}
-
/**
* xe_migrate_update_pgtables() - Pipelined page-table update
* @m: The migrate context.
@@ -1082,7 +1076,7 @@ xe_migrate_update_pgtables(struct xe_migrate *m,
bool first_munmap_rebind = vma && vma->first_munmap_rebind;
/* Use the CPU if no in syncs and engine is idle */
- if (no_in_syncs(syncs, num_syncs) && engine_is_idle(eng)) {
+ if (no_in_syncs(syncs, num_syncs) && (!eng || xe_engine_is_idle(eng))) {
fence = xe_migrate_update_pgtables_cpu(m, vm, bo, updates,
num_updates,
first_munmap_rebind,