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

Submitted by Michel Thierry on Feb. 22, 2018, 5:24 p.m.

Details

Message ID 20180222172405.11386-1-michel.thierry@intel.com
State Accepted
Commit e532be8971c606869ba420e34e85762a947d53cb
Headers show
Series "drm/i915: Update missing parts after the rename to i915_request" ( rev: 1 ) in Intel GFX

Not browsing as part of any series.

Commit Message

Michel Thierry Feb. 22, 2018, 5:24 p.m.
Mostly doc/print messages that were not updated after commit e61e0f51ba79
("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>
---
 drivers/gpu/drm/i915/i915_gem_context.h          | 2 +-
 drivers/gpu/drm/i915/i915_request.c              | 4 ++--
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
index 1829dafe54b4..7854262ddfd9 100644
--- 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
index 9b25270f2491..2265bb8ff4fa 100644
--- 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
index 3edbb3e8c0e1..df7898c8edcb 100644
--- 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;

Comments

Quoting Michel Thierry (2018-02-22 17:24:05)
> Mostly doc/print messages that were not updated after commit e61e0f51ba79
> ("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>
> ---
>  drivers/gpu/drm/i915/i915_gem_context.h          | 2 +-
>  drivers/gpu/drm/i915/i915_request.c              | 4 ++--
>  drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
> index 1829dafe54b4..7854262ddfd9 100644
> --- 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
> index 9b25270f2491..2265bb8ff4fa 100644
> --- 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).
>   *

Hmm, odd that W=1 which seems to be doing the kerneldoc checking didn't
warn me of this one.

Thanks,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris