github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe: Fix fence reservation accouting

Browse Source 
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 <thomas.hellstrom@linux.intel.com>
Reported-by: Christopher Snowhill <kode54@gmail.com>
Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/518
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Matthew Brost 2023-09-11 14:10:32 -07:00 committed by Rodrigo Vivi
parent 1f72718215
commit 30278e2996
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/xe/xe_exec.c
View File

@ -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;

7
drivers/gpu/drm/xe/xe_vm.c
View File

@ -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;