Commit e532be89 authored by Michel Thierry's avatar Michel Thierry Committed by Chris Wilson

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

Mostly doc/print messages that were not updated after commit e61e0f51
("drm/i915: Rename drm_i915_gem_request to i915_request").
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180222172405.11386-1-michel.thierry@intel.com
parent 91e939ae
...@@ -38,8 +38,8 @@ struct drm_file; ...@@ -38,8 +38,8 @@ struct drm_file;
struct drm_i915_private; struct drm_i915_private;
struct drm_i915_file_private; struct drm_i915_file_private;
struct drm_i915_gem_request;
struct i915_hw_ppgtt; struct i915_hw_ppgtt;
struct i915_request;
struct i915_vma; struct i915_vma;
struct intel_ring; struct intel_ring;
......
...@@ -1213,12 +1213,12 @@ static bool __i915_wait_request_check_and_reset(struct i915_request *request) ...@@ -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 * @rq: the request to wait upon
* @flags: how to wait * @flags: how to wait
* @timeout: how long to wait in jiffies * @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 * maximum of @timeout jiffies (with MAX_SCHEDULE_TIMEOUT implying an
* unbounded wait). * unbounded wait).
* *
......
...@@ -876,7 +876,7 @@ static int igt_wait_reset(void *arg) ...@@ -876,7 +876,7 @@ static int igt_wait_reset(void *arg)
timeout = i915_request_wait(rq, I915_WAIT_LOCKED, 10); timeout = i915_request_wait(rq, I915_WAIT_LOCKED, 10);
if (timeout < 0) { 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); timeout);
err = timeout; err = timeout;
goto out_rq; goto out_rq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment