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

Commit 3dce2aca authored by Chris Wilson's avatar Chris Wilson Committed by Zhenyu Wang
Browse files

drm/i915/gvt: Remove bogus retry around i915_wait_request 



commit 8f1117ab ("drm/i915/gvt: handle workload lifecycle properly")
includes some nonsense to retry a indefinite wait - i915_wait_request()
does not return until the request is completed when used from an
uninterruptible context.

Fixes: 8f1117ab ("drm/i915/gvt: handle workload lifecycle properly"
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Chuanxiao Dong <chuanxiao.dong@intel.com>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 3f765a34

drivers/gpu/drm/i915/gvt/scheduler.c

+1 −13
Original line number Diff line number Diff line
@@ -468,19 +468,7 @@ static int workload_thread(void *priv) 


		gvt_dbg_sched("ring id %d wait workload %p\n",

				workload->ring_id, workload);

retry:

		i915_wait_request(workload->req,

					 0, MAX_SCHEDULE_TIMEOUT);

		/* I915 has replay mechanism and a request will be replayed

		 * if there is i915 reset. So the seqno will be updated anyway.

		 * If the seqno is not updated yet after waiting, which means

		 * the replay may still be in progress and we can wait again.

		 */

		if (!i915_gem_request_completed(workload->req)) {

			gvt_dbg_sched("workload %p not completed, wait again\n",

					workload);

			goto retry;

		}

		i915_wait_request(workload->req, 0, MAX_SCHEDULE_TIMEOUT);



complete:

		gvt_dbg_sched("will complete workload %p, status: %d\n",