From 30278e299646a1a8f9c1fd1da33768440f71bb42 Mon Sep 17 00:00:00 2001 From: Matthew Brost Date: Mon, 11 Sep 2023 14:10:32 -0700 Subject: [PATCH] drm/xe: Fix fence reservation accouting MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Both execs and the preempt rebind worker can issue rebinds. Rebinds require a fence, per tile, inserted into dma-resv slots of the VM and BO (if external). The fence reservation accouting did not take into account the number of fences required for rebinds, fix this. v2: Rebase Reviewed-by: Thomas Hellström Reported-by: Christopher Snowhill Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/518 Signed-off-by: Matthew Brost Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_exec.c | 6 +++++- drivers/gpu/drm/xe/xe_vm.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c index eb7fc3192c222..293960efcd22c 100644 --- a/drivers/gpu/drm/xe/xe_exec.c +++ b/drivers/gpu/drm/xe/xe_exec.c @@ -103,7 +103,11 @@ static int xe_exec_begin(struct drm_exec *exec, struct xe_vm *vm) if (xe_vm_no_dma_fences(vm)) return 0; - err = xe_vm_lock_dma_resv(vm, exec, 1, true); + /* + * 1 fence for job from exec plus a fence for each tile from a possible + * rebind + */ + err = xe_vm_lock_dma_resv(vm, exec, 1 + vm->xe->info.tile_count, true); if (err) return err; diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 4def60249381b..89f7428f00d79 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -519,8 +519,13 @@ static int xe_preempt_work_begin(struct drm_exec *exec, struct xe_vm *vm, struct xe_vma *vma; int err; + /* + * 1 fence for each preempt fence plus a fence for each tile from a + * possible rebind + */ err = drm_exec_prepare_obj(exec, xe_vm_obj(vm), - vm->preempt.num_exec_queues); + vm->preempt.num_exec_queues + + vm->xe->info.tile_count); if (err) return err; -- 2.30.2