UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/gtt: Teach restore-gtt to walk the ggtt vma list not the object list 

In preparation, for having non-vma objects stored inside the ggtt, to
handle restoration of the GGTT following resume, we need to walk over
the ggtt address space rebinding vma, as opposed to walking over bound
objects looking for ggtt entries.

v2: Skip objects only bound for the aliasing_ppgtt

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20180605082856.19221-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2018-06-05 09:28:56 +01:00
parent d901e8e673
commit 744799850e
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@ -3569,7 +3569,7 @@ void i915_ggtt_disable_guc(struct drm_i915_private *i915)
void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv) void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
{ {
struct i915_ggtt *ggtt = &dev_priv->ggtt; struct i915_ggtt *ggtt = &dev_priv->ggtt;
struct drm_i915_gem_object *obj, *on; struct i915_vma *vma, *vn;
i915_check_and_clear_faults(dev_priv); i915_check_and_clear_faults(dev_priv);
@ -3579,21 +3579,18 @@ void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
ggtt->base.closed = true; /* skip rewriting PTE on VMA unbind */ ggtt->base.closed = true; /* skip rewriting PTE on VMA unbind */
/* clflush objects bound into the GGTT and rebind them. */ /* clflush objects bound into the GGTT and rebind them. */
list_for_each_entry_safe(obj, on, &dev_priv->mm.bound_list, mm.link) { GEM_BUG_ON(!list_empty(&ggtt->base.active_list));
bool ggtt_bound = false; list_for_each_entry_safe(vma, vn, &ggtt->base.inactive_list, vm_link) {
struct i915_vma *vma; struct drm_i915_gem_object *obj = vma->obj;
for_each_ggtt_vma(vma, obj) { if (!(vma->flags & I915_VMA_GLOBAL_BIND))
if (!i915_vma_unbind(vma)) continue;
continue;
WARN_ON(i915_vma_bind(vma, obj->cache_level, if (!i915_vma_unbind(vma))
PIN_UPDATE)); continue;
ggtt_bound = true;
}
if (ggtt_bound) WARN_ON(i915_vma_bind(vma, obj->cache_level, PIN_UPDATE));
WARN_ON(i915_gem_object_set_to_gtt_domain(obj, false)); WARN_ON(i915_gem_object_set_to_gtt_domain(obj, false));
} }
ggtt->base.closed = false; ggtt->base.closed = false;