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 tag 'drm-fixes-2022-11-25' of git://anongit.freedesktop.org/drm/drm
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
gem
/
i915_gem_ttm.c
diff --git
a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 3d4305eea1aa29a21ac7140889ede5c3e510770d..0d6d640225fc8bfc44c274d92390a1ba8c6cd691 100644
(file)
--- a/
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@
-612,6
+612,10
@@
static int i915_ttm_truncate(struct drm_i915_gem_object *obj)
WARN_ON_ONCE(obj->mm.madv == I915_MADV_WILLNEED);
+ err = ttm_bo_wait(bo, true, false);
+ if (err)
+ return err;
+
err = i915_ttm_move_notify(bo);
if (err)
return err;