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

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

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

drivers/gpu/drm/i915/i915_gem_context.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/i915_request.c

+2 −2
Original line number Diff line number Diff line
@@ -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).

 *

drivers/gpu/drm/i915/selftests/intel_hangcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -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;