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

Commit f552e7bd authored by Zhenyu Wang's avatar Zhenyu Wang
Browse files

drm/i915/gvt: Don't submit request for error workload dispatch 



As vGPU shadow ctx is loaded with guest context state, arbitrarily
submitting request in error workload dispatch path would cause trouble.
So don't try to submit in error path now like in previous code.
This is to fix VM failure when GPU hang happens.

Fixes: f0e99437 ("drm/i915/gvt: Fix workload request allocation before request add")
Reviewed-by: default avatarXiong Zhang <xiong.y.zhang@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 9f498477

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

+9 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ static int dispatch_workload(struct intel_vgpu_workload *workload) 
{

	struct intel_vgpu *vgpu = workload->vgpu;

	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;

	struct i915_request *rq;

	int ring_id = workload->ring_id;

	int ret;
@@ -702,6 +703,14 @@ static int dispatch_workload(struct intel_vgpu_workload *workload) 


	ret = prepare_workload(workload);

out:

	if (ret) {

		/* We might still need to add request with

		 * clean ctx to retire it properly..

		 */

		rq = fetch_and_zero(&workload->req);

		i915_request_put(rq);

	}



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

		gvt_dbg_sched("ring id %d submit workload to i915 %p\n",

				ring_id, workload->req);