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

Sync to v6.8-rc1.

Signed-off-by: Lucas De Marchi <[email protected]>

diff --cc drivers/gpu/drm/xe/xe_exec.c
index 9db1867878a42ec6cf6df2f260f9e4c9ce891ca6,b853feed9ccc15eefab7f0ccdf070096521e6015..59fd9bb40c1899bff6ed79a4a28a28a971fa6957
--- 1/drivers/gpu/drm/xe/xe_exec.c
--- 2/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) {

diff --cc drivers/gpu/drm/xe/xe_gt_pagefault.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_vm.c
Simple merge