mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
drm/i915: Update missing parts after the rename to i915_request
Mostly doc/print messages that were not updated after commit e61e0f51ba
("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
This commit is contained in:
parent
91e939aef0
commit
e532be8971
3 changed files with 4 additions and 4 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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).
|
||||
*
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue