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

Commit 0f2f61d4 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Remove one level of indention from wait-for-execute 



Now that the code is getting simpler, we can reduce the indentation when
waiting for the global_seqno.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223074422.4125-17-chris@chris-wilson.co.uk
parent 24f417ec

drivers/gpu/drm/i915/i915_gem_request.c

+18 −21
Original line number Diff line number Diff line
@@ -1086,10 +1086,8 @@ long i915_wait_request(struct drm_i915_gem_request *req, 
	intel_wait_init(&wait);



restart:

	if (!intel_wait_update_request(&wait, req)) {

	do {

		set_current_state(state);



		if (intel_wait_update_request(&wait, req))

			break;
@@ -1111,7 +1109,6 @@ long i915_wait_request(struct drm_i915_gem_request *req, 
	} while (1);



	GEM_BUG_ON(!intel_wait_has_seqno(&wait));

	}

	GEM_BUG_ON(!i915_sw_fence_signaled(&req->submit));



	/* Optimistic short spin before touching IRQs */