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

Commit b42606b0 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-fixes-2019-01-24' of https://github.com/intel/gvt-linux into drm-intel-fixes 



gvt-fixes-2019-01-24

- Fix destroy of shadow batch and indirect ctx (Weinan)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190124054801.GP7203@zhen-hp.sh.intel.com
parents 2b244081 0f755512

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

+6 −5
Original line number Diff line number Diff line
@@ -332,6 +332,9 @@ static void release_shadow_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) 


	i915_gem_object_unpin_map(wa_ctx->indirect_ctx.obj);

	i915_gem_object_put(wa_ctx->indirect_ctx.obj);



	wa_ctx->indirect_ctx.obj = NULL;

	wa_ctx->indirect_ctx.shadow_va = NULL;

}



static int set_context_ppgtt_from_shadow(struct intel_vgpu_workload *workload,
@@ -911,11 +914,6 @@ static void complete_current_workload(struct intel_gvt *gvt, int ring_id) 


	list_del_init(&workload->list);



	if (!workload->status) {

		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 is not successful means HW GPU

		 * has occurred GPU hang or something wrong with i915/GVT,
@@ -1283,6 +1281,9 @@ void intel_vgpu_destroy_workload(struct intel_vgpu_workload *workload) 
{

	struct intel_vgpu_submission *s = &workload->vgpu->submission;



	release_shadow_batch_buffer(workload);

	release_shadow_wa_ctx(&workload->wa_ctx);



	if (workload->shadow_mm)

		intel_vgpu_mm_put(workload->shadow_mm);