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

Commit d223760f authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Wait for all fences before installing an exclusive clflush fence 



Ensure that before we overwrite the reservation_object with our
exclusive fence for the pending clflush operation, that we do wait upon
all the fences in the current reservation_object.

Fixes: 57822dc6 ("drm/i915: Perform object clflushing asynchronously")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170323085758.11695-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
parent 233ebf57

drivers/gpu/drm/i915/i915_gem_clflush.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void i915_gem_clflush_object(struct drm_i915_gem_object *obj, 


		i915_sw_fence_await_reservation(&clflush->wait,

						obj->resv, NULL,

						false, I915_FENCE_TIMEOUT,

						true, I915_FENCE_TIMEOUT,

						GFP_KERNEL);



		reservation_object_lock(obj->resv, NULL);