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

Commit 541ca6ed authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Inline __i915_gem_request_wait_for_execute() 



It had only one callsite and existed to keep the code clearer. Now
having shared the wait-on-error between phases and with plans to change
the wait-for-execute in the next few patches, remove the out of line
wait loop and move it into the main body of i915_wait_request.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223074422.4125-7-chris@chris-wilson.co.uk
parent 7de53bf7

drivers/gpu/drm/i915/i915_gem_request.c

+29 −49
Original line number Original line Diff line number Diff line
@@ -1004,54 +1004,6 @@ bool __i915_spin_request(const struct drm_i915_gem_request *req, 
	return false;

	return false;

}

}





static long

__i915_request_wait_for_execute(struct drm_i915_gem_request *request,

				unsigned int flags,

				long timeout)

{

	const int state = flags & I915_WAIT_INTERRUPTIBLE ?

		TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE;

	wait_queue_head_t *q = &request->i915->gpu_error.wait_queue;

	DEFINE_WAIT(reset);

	DEFINE_WAIT(wait);



	if (flags & I915_WAIT_LOCKED)

		add_wait_queue(q, &reset);



	do {

		prepare_to_wait(&request->execute.wait, &wait, state);



		if (i915_sw_fence_done(&request->execute))

			break;



		if (flags & I915_WAIT_LOCKED &&

		    i915_reset_in_progress(&request->i915->gpu_error)) {

			__set_current_state(TASK_RUNNING);

			i915_reset(request->i915);

			reset_wait_queue(q, &reset);

			continue;

		}



		if (signal_pending_state(state, current)) {

			timeout = -ERESTARTSYS;

			break;

		}



		if (!timeout) {

			timeout = -ETIME;

			break;

		}



		timeout = io_schedule_timeout(timeout);

	} while (1);

	finish_wait(&request->execute.wait, &wait);



	if (flags & I915_WAIT_LOCKED)

		remove_wait_queue(q, &reset);



	return timeout;

}



/**

/**

 * i915_wait_request - wait until execution of request has finished

 * i915_wait_request - wait until execution of request has finished

 * @req: the request to wait upon

 * @req: the request to wait upon
@@ -1101,7 +1053,35 @@ long i915_wait_request(struct drm_i915_gem_request *req, 
		add_wait_queue(errq, &reset);

		add_wait_queue(errq, &reset);





	if (!i915_sw_fence_done(&req->execute)) {

	if (!i915_sw_fence_done(&req->execute)) {

		timeout = __i915_request_wait_for_execute(req, flags, timeout);

		DEFINE_WAIT(exec);



		do {

			prepare_to_wait(&req->execute.wait, &exec, state);

			if (i915_sw_fence_done(&req->execute))

				break;



			if (flags & I915_WAIT_LOCKED &&

			    i915_reset_in_progress(&req->i915->gpu_error)) {

				__set_current_state(TASK_RUNNING);

				i915_reset(req->i915);

				reset_wait_queue(errq, &reset);

				continue;

			}



			if (signal_pending_state(state, current)) {

				timeout = -ERESTARTSYS;

				break;

			}



			if (!timeout) {

				timeout = -ETIME;

				break;

			}



			timeout = io_schedule_timeout(timeout);

		} while (1);

		finish_wait(&req->execute.wait, &exec);



		if (timeout < 0)

		if (timeout < 0)

			goto complete;

			goto complete;