Commit b7474119 authored by Thomas Hellström's avatar Thomas Hellström Committed by Rodrigo Vivi

drm/xe: Make page-table updates using the default engine happen in order

If the default engine m->eng was used, there is no check for idle and
a cpu page-table update may thus happen in parallel with a gpu one.
Don't allow CPU page-table updates with the default engine until
the engine is idle.
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230629205134.111849-2-thomas.hellstrom@linux.intel.comSigned-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent c0ab10ee
...@@ -1160,9 +1160,10 @@ xe_migrate_update_pgtables(struct xe_migrate *m, ...@@ -1160,9 +1160,10 @@ xe_migrate_update_pgtables(struct xe_migrate *m,
int err = 0; int err = 0;
bool usm = !eng && xe->info.supports_usm; bool usm = !eng && xe->info.supports_usm;
bool first_munmap_rebind = vma && vma->first_munmap_rebind; bool first_munmap_rebind = vma && vma->first_munmap_rebind;
struct xe_engine *eng_override = !eng ? m->eng : eng;
/* Use the CPU if no in syncs and engine is idle */ /* Use the CPU if no in syncs and engine is idle */
if (no_in_syncs(syncs, num_syncs) && (!eng || xe_engine_is_idle(eng))) { if (no_in_syncs(syncs, num_syncs) && xe_engine_is_idle(eng_override)) {
fence = xe_migrate_update_pgtables_cpu(m, vm, bo, updates, fence = xe_migrate_update_pgtables_cpu(m, vm, bo, updates,
num_updates, num_updates,
first_munmap_rebind, first_munmap_rebind,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment