git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-xe-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
xe
/
xe_exec.c
diff --git
a/drivers/gpu/drm/xe/xe_exec.c
b/drivers/gpu/drm/xe/xe_exec.c
index 9db1867878a42ec6cf6df2f260f9e4c9ce891ca6..59fd9bb40c1899bff6ed79a4a28a28a971fa6957 100644
(file)
--- a/
drivers/gpu/drm/xe/xe_exec.c
+++ b/
drivers/gpu/drm/xe/xe_exec.c
@@
-230,7
+230,7
@@
retry:
vm_exec.vm = &vm->gpuvm;
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) {