Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8462d0a authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Retire the VMA's fence tracker before unbinding 



Since we may track unfenced access (GPU access to the vma that
explicitly requires no fence), vma->last_fence may be set without any
attached fence (vma->fence) and so will not be flushed when we call
i915_vma_put_fence(). Since we stopped doing a full retire of the
activity trackers for unbind, we need to explicitly retire each tracker.

Fixes: b0decaf7 ("drm/i915: Track active vma requests")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170620124321.1108-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
(cherry picked from commit 760a898d)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c0bc126f

drivers/gpu/drm/i915/i915_vma.c

+5 −0
Original line number Diff line number Diff line
@@ -650,6 +650,11 @@ int i915_vma_unbind(struct i915_vma *vma) 
				break;

		}



		if (!ret) {

			ret = i915_gem_active_retire(&vma->last_fence,

						     &vma->vm->i915->drm.struct_mutex);

		}



		__i915_vma_unpin(vma);

		if (ret)

			return ret;