Commit 0a3242bd authored by Xiaolin Zhang's avatar Xiaolin Zhang Committed by Zhenyu Wang
Browse files

drm/i915/gvt: update vgpu workload head pointer correctly 



when creating a vGPU workload, the guest context head pointer should
be updated correctly by comparing with the exsiting workload in the
guest worklod queue including the current running context.

in some situation, there is a running context A and then received 2 new
vGPU workload context B and A. in the new workload context A, it's head
pointer should be updated with the running context A's tail.

v2: walk through guest workload list in backward way.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarXiaolin Zhang <xiaolin.zhang@intel.com>
Reviewed-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent c36beba6

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

+15 −13
Original line number Diff line number Diff line
@@ -1371,9 +1371,6 @@ static int prepare_mm(struct intel_vgpu_workload *workload) 
#define same_context(a, b) (((a)->context_id == (b)->context_id) && \

		((a)->lrca == (b)->lrca))



#define get_last_workload(q) \

	(list_empty(q) ? NULL : container_of(q->prev, \

	struct intel_vgpu_workload, list))

/**

 * intel_vgpu_create_workload - create a vGPU workload

 * @vgpu: a vGPU
@@ -1393,7 +1390,7 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id, 
{

	struct intel_vgpu_submission *s = &vgpu->submission;

	struct list_head *q = workload_q_head(vgpu, ring_id);

	struct intel_vgpu_workload *last_workload = get_last_workload(q);

	struct intel_vgpu_workload *last_workload = NULL;

	struct intel_vgpu_workload *workload = NULL;

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

	u64 ring_context_gpa;
@@ -1416,8 +1413,11 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id, 
	head &= RB_HEAD_OFF_MASK;

	tail &= RB_TAIL_OFF_MASK;



	if (last_workload && same_context(&last_workload->ctx_desc, desc)) {

		gvt_dbg_el("ring id %d cur workload == last\n", ring_id);

	list_for_each_entry_reverse(last_workload, q, list) {



		if (same_context(&last_workload->ctx_desc, desc)) {

			gvt_dbg_el("ring id %d cur workload == last\n",

					ring_id);

			gvt_dbg_el("ctx head %x real head %lx\n", head,

					last_workload->rb_tail);

			/*
@@ -1425,6 +1425,8 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id, 
			 * as it might not be updated at this time

			 */

			head = last_workload->rb_tail;

			break;

		}

	}



	gvt_dbg_el("ring id %d begin a new workload\n", ring_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE