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

Commit 776f3236 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: s/__i915_wait_request/i915_wait_request/ 



There is only one wait on request function now, so drop the "expert"
indication of leading __.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470293567-10811-21-git-send-email-chris@chris-wilson.co.uk
parent 37db1470

drivers/gpu/drm/i915/i915_gem.c

+9 −9
Original line number Diff line number Diff line
@@ -1420,7 +1420,7 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj, 
	mutex_unlock(&dev->struct_mutex);

	ret = 0;

	for (i = 0; ret == 0 && i < n; i++)

		ret = __i915_wait_request(requests[i], true, NULL, rps);

		ret = i915_wait_request(requests[i], true, NULL, rps);

	mutex_lock(&dev->struct_mutex);



	for (i = 0; i < n; i++)
@@ -2726,7 +2726,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 


	for (i = 0; i < n; i++) {

		if (ret == 0)

			ret = __i915_wait_request(requests[i], true,

			ret = i915_wait_request(requests[i], true,

						args->timeout_ns > 0 ? &args->timeout_ns : NULL,

						to_rps_client(file));

		i915_gem_request_put(requests[i]);
@@ -2744,7 +2744,7 @@ __i915_gem_object_sync(struct drm_i915_gem_request *to, 
		return 0;



	if (!i915.semaphores) {

		ret = __i915_wait_request(from,

		ret = i915_wait_request(from,

					from->i915->mm.interruptible,

					NULL,

					NO_WAITBOOST);
@@ -3712,7 +3712,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) 
	if (target == NULL)

		return 0;



	ret = __i915_wait_request(target, true, NULL, NULL);

	ret = i915_wait_request(target, true, NULL, NULL);

	i915_gem_request_put(target);



	return ret;

drivers/gpu/drm/i915/i915_gem_request.c

+8 −8
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static signed long i915_fence_wait(struct fence *fence, 
		timeout = NULL;

	}



	ret = __i915_wait_request(to_request(fence),

	ret = i915_wait_request(to_request(fence),

				interruptible, timeout,

				NO_WAITBOOST);

	if (ret == -ETIME)
@@ -579,7 +579,7 @@ bool __i915_spin_request(const struct drm_i915_gem_request *req, 
}



/**

 * __i915_wait_request - wait until execution of request has finished

 * i915_wait_request - wait until execution of request has finished

 * @req: duh!

 * @interruptible: do an interruptible wait (normally yes)

 * @timeout: in - how long to wait (NULL forever); out - how much time remaining
@@ -595,7 +595,7 @@ bool __i915_spin_request(const struct drm_i915_gem_request *req, 
 * Returns 0 if the request was found within the alloted time. Else returns the

 * errno with remaining time filled in timeout argument.

 */

int __i915_wait_request(struct drm_i915_gem_request *req,

int i915_wait_request(struct drm_i915_gem_request *req,

		      bool interruptible,

		      s64 *timeout,

		      struct intel_rps_client *rps)

drivers/gpu/drm/i915/i915_gem_request.h

+6 −6
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ struct intel_rps_client; 
#define IS_RPS_CLIENT(p) (!IS_ERR(p))

#define IS_RPS_USER(p) (!IS_ERR_OR_NULL(p))



int __i915_wait_request(struct drm_i915_gem_request *req,

int i915_wait_request(struct drm_i915_gem_request *req,

		      bool interruptible,

		      s64 *timeout,

		      struct intel_rps_client *rps)
@@ -418,7 +418,7 @@ i915_gem_active_wait(const struct i915_gem_active *active, struct mutex *mutex) 
	if (!request)

		return 0;



	return __i915_wait_request(request, true, NULL, NULL);

	return i915_wait_request(request, true, NULL, NULL);

}



/**
@@ -441,7 +441,7 @@ i915_gem_active_retire(struct i915_gem_active *active, 
	if (!request)

		return 0;



	ret = __i915_wait_request(request, true, NULL, NULL);

	ret = i915_wait_request(request, true, NULL, NULL);

	if (ret)

		return ret;

drivers/gpu/drm/i915/i915_gem_userptr.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void wait_rendering(struct drm_i915_gem_object *obj) 
	mutex_unlock(&dev->struct_mutex);



	for (i = 0; i < n; i++)

		__i915_wait_request(requests[i], false, NULL, NULL);

		i915_wait_request(requests[i], false, NULL, NULL);



	mutex_lock(&dev->struct_mutex);

drivers/gpu/drm/i915/intel_display.c

+7 −7
Original line number Diff line number Diff line
@@ -11463,7 +11463,7 @@ static void intel_mmio_flip_work_func(struct work_struct *w) 
	struct reservation_object *resv;



	if (work->flip_queued_req)

		WARN_ON(__i915_wait_request(work->flip_queued_req,

		WARN_ON(i915_wait_request(work->flip_queued_req,

					  false, NULL,

					  NO_WAITBOOST));
@@ -13508,7 +13508,7 @@ static int intel_atomic_prepare_commit(struct drm_device *dev, 
			if (!intel_plane_state->wait_req)

				continue;



			ret = __i915_wait_request(intel_plane_state->wait_req,

			ret = i915_wait_request(intel_plane_state->wait_req,

						true, NULL, NULL);

			if (ret) {

				/* Any hang should be swallowed by the wait */
@@ -13621,7 +13621,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) 
		if (!intel_plane_state->wait_req)

			continue;



		ret = __i915_wait_request(intel_plane_state->wait_req,

		ret = i915_wait_request(intel_plane_state->wait_req,

					true, NULL, NULL);

		/* EIO should be eaten, and we can't get interrupted in the

		 * worker, and blocking commits have waited already. */