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

Commit e3a5a225 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: fix for when semaphore updates fail 



This fixes a long standing issue where emitting the semaphore updates
may have failed, but we've already updated our internal data structure.

Reported-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarBen Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5816d648

drivers/gpu/drm/i915/i915_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -2001,10 +2001,12 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj, 
		seqno = request->seqno;

	}



	from->sync_seqno[idx] = seqno;



	return to->sync_to(to, from, seqno - 1);

	ret = to->sync_to(to, from, seqno - 1);

	if (!ret)

		from->sync_seqno[idx] = seqno;



	return ret;

}



static void i915_gem_object_finish_gtt(struct drm_i915_gem_object *obj)