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

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

drm/i915: Rename request reference/unreference to get/put 



Now that we derive requests from struct fence, swap over to its
nomenclature for references. It's shorter and more idiomatic across the
kernel.

s/i915_gem_request_reference/i915_gem_request_get/
s/i915_gem_request_unreference/i915_gem_request_put/

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-2-git-send-email-chris@chris-wilson.co.uk
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-1-git-send-email-chris@chris-wilson.co.uk
parent c13d87ea

drivers/gpu/drm/i915/i915_gem.c

+7 −7
Original line number Diff line number Diff line
@@ -1422,7 +1422,7 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj, 
		if (req == NULL)

			return 0;



		requests[n++] = i915_gem_request_reference(req);

		requests[n++] = i915_gem_request_get(req);

	} else {

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

			struct drm_i915_gem_request *req;
@@ -1431,7 +1431,7 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj, 
			if (req == NULL)

				continue;



			requests[n++] = i915_gem_request_reference(req);

			requests[n++] = i915_gem_request_get(req);

		}

	}
@@ -1444,7 +1444,7 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj, 
	for (i = 0; i < n; i++) {

		if (ret == 0)

			i915_gem_object_retire_request(obj, requests[i]);

		i915_gem_request_unreference(requests[i]);

		i915_gem_request_put(requests[i]);

	}



	return ret;
@@ -2820,7 +2820,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
		if (obj->last_read_req[i] == NULL)

			continue;



		req[n++] = i915_gem_request_reference(obj->last_read_req[i]);

		req[n++] = i915_gem_request_get(obj->last_read_req[i]);

	}



	mutex_unlock(&dev->struct_mutex);
@@ -2830,7 +2830,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
			ret = __i915_wait_request(req[i], true,

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

						  to_rps_client(file));

		i915_gem_request_unreference(req[i]);

		i915_gem_request_put(req[i]);

	}

	return ret;
@@ -3845,14 +3845,14 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) 
		target = request;

	}

	if (target)

		i915_gem_request_reference(target);

		i915_gem_request_get(target);

	spin_unlock(&file_priv->mm.lock);



	if (target == NULL)

		return 0;



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

	i915_gem_request_unreference(target);

	i915_gem_request_put(target);



	return ret;

}

drivers/gpu/drm/i915/i915_gem_request.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request) 
	}



	i915_gem_context_unreference(request->ctx);

	i915_gem_request_unreference(request);

	i915_gem_request_put(request);

}



void i915_gem_request_retire_upto(struct drm_i915_gem_request *req)

drivers/gpu/drm/i915/i915_gem_request.h

+4 −4
Original line number Diff line number Diff line
@@ -174,13 +174,13 @@ to_request(struct fence *fence) 
}



static inline struct drm_i915_gem_request *

i915_gem_request_reference(struct drm_i915_gem_request *req)

i915_gem_request_get(struct drm_i915_gem_request *req)

{

	return to_request(fence_get(&req->fence));

}



static inline void

i915_gem_request_unreference(struct drm_i915_gem_request *req)

i915_gem_request_put(struct drm_i915_gem_request *req)

{

	fence_put(&req->fence);

}
@@ -189,10 +189,10 @@ static inline void i915_gem_request_assign(struct drm_i915_gem_request **pdst, 
					   struct drm_i915_gem_request *src)

{

	if (src)

		i915_gem_request_reference(src);

		i915_gem_request_get(src);



	if (*pdst)

		i915_gem_request_unreference(*pdst);

		i915_gem_request_put(*pdst);



	*pdst = src;

}

drivers/gpu/drm/i915/i915_gem_userptr.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static void wait_rendering(struct drm_i915_gem_object *obj) 
		if (req == NULL)

			continue;



		requests[n++] = i915_gem_request_reference(req);

		requests[n++] = i915_gem_request_get(req);

	}



	mutex_unlock(&dev->struct_mutex);
@@ -89,7 +89,7 @@ static void wait_rendering(struct drm_i915_gem_object *obj) 
	mutex_lock(&dev->struct_mutex);



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

		i915_gem_request_unreference(requests[i]);

		i915_gem_request_put(requests[i]);

}



static void cancel_userptr(struct work_struct *work)

drivers/gpu/drm/i915/intel_breadcrumbs.c

+2 −2
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static int intel_breadcrumbs_signaler(void *arg) 
			rb_erase(&request->signaling.node, &b->signals);

			spin_unlock(&b->lock);



			i915_gem_request_unreference(request);

			i915_gem_request_put(request);

		} else {

			if (kthread_should_stop())

				break;
@@ -484,7 +484,7 @@ void intel_engine_enable_signaling(struct drm_i915_gem_request *request) 


	request->signaling.wait.tsk = b->signaler;

	request->signaling.wait.seqno = request->fence.seqno;

	i915_gem_request_reference(request);

	i915_gem_request_get(request);



	/* First add ourselves into the list of waiters, but register our

	 * bottom-half as the signaller thread. As per usual, only the oldest