Commit 5b364bec authored by Chris Wilson's avatar Chris Wilson

drm/i915: Flush ggtt writes through the old fenced vma before changing fences

This is a precautionary measure as I have no evidence to suggest we've
hit a bug here (I was hoping this might explain gdg's odd behaviour, but
alas), but given that we have a function to flush the ggtt writes it
seems prudent to use it prior to changing the fence register. Due to the
intrinsic nature of the GTT often operating as an independent mmio path,
we should not just rely on the write to the fence acting as a full flush
for GTT writes.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180130164457.14037-1-chris@chris-wilson.co.uk
parent b1852d36
...@@ -230,10 +230,14 @@ static int fence_update(struct drm_i915_fence_reg *fence, ...@@ -230,10 +230,14 @@ static int fence_update(struct drm_i915_fence_reg *fence,
} }
if (fence->vma) { if (fence->vma) {
ret = i915_gem_active_retire(&fence->vma->last_fence, struct i915_vma *old = fence->vma;
&fence->vma->obj->base.dev->struct_mutex);
ret = i915_gem_active_retire(&old->last_fence,
&old->obj->base.dev->struct_mutex);
if (ret) if (ret)
return ret; return ret;
i915_vma_flush_writes(old);
} }
if (fence->vma && fence->vma != vma) { if (fence->vma && fence->vma != vma) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment