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: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230629205134.111849-2-thomas.hellstrom@linux.intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index a62bd7ec8a42c12f872f43e491f6a70f61a83f26..be98690f2bc9bed3a0880142f8c5177763939d03 100644 (file)
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -1160,9 +1160,10 @@ xe_migrate_update_pgtables(struct xe_migrate *m,
        int err = 0;
        bool usm = !eng && xe->info.supports_usm;
        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 */
-       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,
                                                        num_updates,
                                                        first_munmap_rebind,