| Message ID | 20191119112515.2766748-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/gem: Track ggtt writes from userspace on the bound vma | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > When userspace writes into the GTT itself, it is supposed to call > set-domain to let the kernel keep track and so manage the CPU/GPU > caches. As we track writes on the individual i915_vma, we should also be > sure to mark them as dirty. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_domain.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c > index e2af63af67ad..9aebcf263191 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c > @@ -149,9 +149,17 @@ i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, bool write) > GEM_BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0); > obj->read_domains |= I915_GEM_DOMAIN_GTT; > if (write) { > + struct i915_vma *vma; > + > obj->read_domains = I915_GEM_DOMAIN_GTT; > obj->write_domain = I915_GEM_DOMAIN_GTT; > obj->mm.dirty = true; > + > + spin_lock(&obj->vma.lock); > + for_each_ggtt_vma(vma, obj) > + if (i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND)) > + i915_vma_set_ggtt_write(vma); > + spin_unlock(&obj->vma.lock); > } > > i915_gem_object_unpin_pages(obj); > -- > 2.24.0
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c index e2af63af67ad..9aebcf263191 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c @@ -149,9 +149,17 @@ i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj, bool write) GEM_BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0); obj->read_domains |= I915_GEM_DOMAIN_GTT; if (write) { + struct i915_vma *vma; + obj->read_domains = I915_GEM_DOMAIN_GTT; obj->write_domain = I915_GEM_DOMAIN_GTT; obj->mm.dirty = true; + + spin_lock(&obj->vma.lock); + for_each_ggtt_vma(vma, obj) + if (i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND)) + i915_vma_set_ggtt_write(vma); + spin_unlock(&obj->vma.lock); } i915_gem_object_unpin_pages(obj);
When userspace writes into the GTT itself, it is supposed to call set-domain to let the kernel keep track and so manage the CPU/GPU caches. As we track writes on the individual i915_vma, we should also be sure to mark them as dirty. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 8 ++++++++ 1 file changed, 8 insertions(+)