diff options
| author | Chris Wilson <[email protected]> | 2020-05-26 16:07:39 +0100 |
|---|---|---|
| committer | Chris Wilson <[email protected]> | 2020-05-27 10:51:57 +0100 |
| commit | 0109a16ef391b2ebfbfdf08250c1dfb5dbf83d1e (patch) | |
| tree | 6f58e0a5daab9d7a7c8d2ccdee456902aa889966 | |
| parent | 511b6d9aed417739b6aa49d0b6b4354ad21020f1 (diff) | |
drm/i915/gt: Clear LOCAL_BIND from shared GGTT on resume
We only restore GLOBAL binds upon resume as we expect these to be pinned
for use by HW, whereas the LOCAL binds can be recreated on demand once
userspace is resumed. For the LOCAL bind to be recreated in the global
GTT (for old systems without ppgtt), we need to clear its presence flag
on deciding not to restore the mapping upon resume.
Fixes: bf0840cdb304 ("drm/i915/gt: Stop cross-polluting PIN_GLOBAL with PIN_USER with no-ppgtt")
Signed-off-by: Chris Wilson <[email protected]>
Reviewed-by: Matthew Auld <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_ggtt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 8c275f8588c3..317172ad5ef3 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -1161,6 +1161,11 @@ void i915_ggtt_disable_guc(struct i915_ggtt *ggtt) ggtt->invalidate(ggtt); } +static unsigned int clear_bind(struct i915_vma *vma) +{ + return atomic_fetch_and(~I915_VMA_BIND_MASK, &vma->flags); +} + void i915_ggtt_resume(struct i915_ggtt *ggtt) { struct i915_vma *vma; @@ -1179,10 +1184,9 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt) list_for_each_entry(vma, &ggtt->vm.bound_list, vm_link) { struct drm_i915_gem_object *obj = vma->obj; - if (!i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND)) + if (!(clear_bind(vma) & I915_VMA_GLOBAL_BIND)) continue; - clear_bit(I915_VMA_GLOBAL_BIND_BIT, __i915_vma_flags(vma)); WARN_ON(i915_vma_bind(vma, obj ? obj->cache_level : 0, PIN_GLOBAL, NULL)); |