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

Commit f4c43db3 authored by Changbin Du's avatar Changbin Du Committed by Zhenyu Wang
Browse files

drm/i915/gvt: Cancel dma map when resetting ggtt entries 



Ditto, don't forget ggtt entries during reset.

Signed-off-by: default avatarChangbin Du <changbin.du@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 7598e870

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

+17 −5
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ int intel_vgpu_init_gtt(struct intel_vgpu *vgpu) 
		return PTR_ERR(gtt->ggtt_mm);

	}



	intel_vgpu_reset_ggtt(vgpu);

	intel_vgpu_reset_ggtt(vgpu, false);



	return create_scratch_page_tree(vgpu);

}
@@ -2341,17 +2341,19 @@ void intel_vgpu_invalidate_ppgtt(struct intel_vgpu *vgpu) 
/**

 * intel_vgpu_reset_ggtt - reset the GGTT entry

 * @vgpu: a vGPU

 * @invalidate_old: invalidate old entries

 *

 * This function is called at the vGPU create stage

 * to reset all the GGTT entries.

 *

 */

void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu)

void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old)

{

	struct intel_gvt *gvt = vgpu->gvt;

	struct drm_i915_private *dev_priv = gvt->dev_priv;

	struct intel_gvt_gtt_pte_ops *pte_ops = vgpu->gvt->gtt.pte_ops;

	struct intel_gvt_gtt_entry entry = {.type = GTT_TYPE_GGTT_PTE};

	struct intel_gvt_gtt_entry old_entry;

	u32 index;

	u32 num_entries;
@@ -2360,13 +2362,23 @@ void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu) 


	index = vgpu_aperture_gmadr_base(vgpu) >> PAGE_SHIFT;

	num_entries = vgpu_aperture_sz(vgpu) >> PAGE_SHIFT;

	while (num_entries--)

	while (num_entries--) {

		if (invalidate_old) {

			ggtt_get_host_entry(vgpu->gtt.ggtt_mm, &old_entry, index);

			ggtt_invalidate_pte(vgpu, &old_entry);

		}

		ggtt_set_host_entry(vgpu->gtt.ggtt_mm, &entry, index++);

	}



	index = vgpu_hidden_gmadr_base(vgpu) >> PAGE_SHIFT;

	num_entries = vgpu_hidden_sz(vgpu) >> PAGE_SHIFT;

	while (num_entries--)

	while (num_entries--) {

		if (invalidate_old) {

			ggtt_get_host_entry(vgpu->gtt.ggtt_mm, &old_entry, index);

			ggtt_invalidate_pte(vgpu, &old_entry);

		}

		ggtt_set_host_entry(vgpu->gtt.ggtt_mm, &entry, index++);

	}



	ggtt_invalidate(dev_priv);

}
@@ -2386,5 +2398,5 @@ void intel_vgpu_reset_gtt(struct intel_vgpu *vgpu) 
	 * removing the shadow pages.

	 */

	intel_vgpu_destroy_all_ppgtt_mm(vgpu);

	intel_vgpu_reset_ggtt(vgpu);

	intel_vgpu_reset_ggtt(vgpu, true);

}

drivers/gpu/drm/i915/gvt/gtt.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct intel_vgpu_gtt { 


extern int intel_vgpu_init_gtt(struct intel_vgpu *vgpu);

extern void intel_vgpu_clean_gtt(struct intel_vgpu *vgpu);

void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu);

void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old);

void intel_vgpu_invalidate_ppgtt(struct intel_vgpu *vgpu);



extern int intel_gvt_init_gtt(struct intel_gvt *gvt);