From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Mon, 22 Jan 2024 23:10:10 +0000 (-0800)
Subject: Merge drm/drm-next into drm-xe-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=be3382ecdf317f005e7d47356d0a9256cc36dd88;p=linux.git

Merge drm/drm-next into drm-xe-next

Sync to v6.8-rc1.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---

be3382ecdf317f005e7d47356d0a9256cc36dd88
diff --cc drivers/gpu/drm/xe/xe_exec.c
index 9db1867878a42,b853feed9ccc1..59fd9bb40c189
--- a/drivers/gpu/drm/xe/xe_exec.c
+++ b/drivers/gpu/drm/xe/xe_exec.c
@@@ -228,9 -189,10 +228,9 @@@ retry
  	}
  
  	vm_exec.vm = &vm->gpuvm;
 -	vm_exec.num_fences = 1 + vm->xe->info.tile_count;
  	vm_exec.flags = DRM_EXEC_INTERRUPTIBLE_WAIT;
  	if (xe_vm_in_lr_mode(vm)) {
- 		drm_exec_init(exec, vm_exec.flags);
+ 		drm_exec_init(exec, vm_exec.flags, 0);
  	} else {
  		err = drm_gpuvm_exec_lock(&vm_exec);
  		if (err) {