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

Commit f2e2c00a authored by Chuanxiao Dong's avatar Chuanxiao Dong Committed by Zhenyu Wang
Browse files

drm/i915/gvt: clean workload queue if error happened 



If a workload caused a HW GPU hang or it is in the middle of
vGPU reset, the workload queue should be cleaned up to emulate
the hang state of the GPU.

v2:
- use ENGINE_MASK(ring_id) instead of (1 << ring_id). (Zhenyu)

Signed-off-by: default avatarChuanxiao Dong <chuanxiao.dong@intel.com>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 6184cc8d

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

+18 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#define same_context(a, b) (((a)->context_id == (b)->context_id) && \

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



static void clean_workloads(struct intel_vgpu *vgpu, unsigned long engine_mask);



static int context_switch_events[] = {

	[RCS] = RCS_AS_CONTEXT_SWITCH,

	[BCS] = BCS_AS_CONTEXT_SWITCH,
@@ -512,8 +514,23 @@ static int complete_execlist_workload(struct intel_vgpu_workload *workload) 
	release_shadow_batch_buffer(workload);

	release_shadow_wa_ctx(&workload->wa_ctx);



	if (workload->status || (vgpu->resetting_eng & ENGINE_MASK(ring_id)))

	if (workload->status || (vgpu->resetting_eng & ENGINE_MASK(ring_id))) {

		/* if workload->status is not successful means HW GPU

		 * has occurred GPU hang or something wrong with i915/GVT,

		 * and GVT won't inject context switch interrupt to guest.

		 * So this error is a vGPU hang actually to the guest.

		 * According to this we should emunlate a vGPU hang. If

		 * there are pending workloads which are already submitted

		 * from guest, we should clean them up like HW GPU does.

		 *

		 * if it is in middle of engine resetting, the pending

		 * workloads won't be submitted to HW GPU and will be

		 * cleaned up during the resetting process later, so doing

		 * the workload clean up here doesn't have any impact.

		 **/

		clean_workloads(vgpu, ENGINE_MASK(ring_id));

		goto out;

	}



	if (!list_empty(workload_q_head(vgpu, ring_id))) {

		struct execlist_ctx_descriptor_format *this_desc, *next_desc;