drm/i915: Update missing parts after the rename to i915_request

mthierry · ickle · commit e532be8971c6 · 2018-02-23T16:34:32.000Z
Mostly doc/print messages that were not updated after commit e61e0f5 ("drm/i915: Rename drm_i915_gem_request to i915_request"). Signed-off-by: Michel Thierry <michel.thierry@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20180222172405.11386-1-michel.thierry@intel.com
diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
@@ -38,8 +38,8 @@ struct drm_file;
 
 struct drm_i915_private;
 struct drm_i915_file_private;
-struct drm_i915_gem_request;
 struct i915_hw_ppgtt;
+struct i915_request;
 struct i915_vma;
 struct intel_ring;
 
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
@@ -1213,12 +1213,12 @@ static bool __i915_wait_request_check_and_reset(struct i915_request *request)
 }
 
 /**
- * i915_wait_request - wait until execution of request has finished
+ * i915_request_wait - wait until execution of request has finished
  * @rq: the request to wait upon
  * @flags: how to wait
  * @timeout: how long to wait in jiffies
  *
- * i915_wait_request() waits for the request to be completed, for a
+ * i915_request_wait() waits for the request to be completed, for a
  * maximum of @timeout jiffies (with MAX_SCHEDULE_TIMEOUT implying an
  * unbounded wait).
  *
diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c
@@ -876,7 +876,7 @@ static int igt_wait_reset(void *arg)
 
 	timeout = i915_request_wait(rq, I915_WAIT_LOCKED, 10);
 	if (timeout < 0) {
-		pr_err("i915_wait_request failed on a stuck request: err=%ld\n",
+		pr_err("i915_request_wait failed on a stuck request: err=%ld\n",
 		       timeout);
 		err = timeout;
 		goto out_rq;

Original file line number	Diff line number	Diff line change
`@@ -1213,12 +1213,12 @@ static bool __i915_wait_request_check_and_reset(struct i915_request *request)`
`1213`	`1213`	`}`
`1214`	`1214`
`1215`	`1215`	`/**`
`1216`		`- * i915_wait_request - wait until execution of request has finished`
	`1216`	`+ * i915_request_wait - wait until execution of request has finished`
`1217`	`1217`	`* @rq: the request to wait upon`
`1218`	`1218`	`* @flags: how to wait`
`1219`	`1219`	`* @timeout: how long to wait in jiffies`
`1220`	`1220`	`*`
`1221`		`- * i915_wait_request() waits for the request to be completed, for a`
	`1221`	`+ * i915_request_wait() waits for the request to be completed, for a`
`1222`	`1222`	`* maximum of @timeout jiffies (with MAX_SCHEDULE_TIMEOUT implying an`
`1223`	`1223`	`* unbounded wait).`
`1224`	`1224`	`*`