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

Commit 67c3f3fc authored by Jani Nikula's avatar Jani Nikula
Browse files

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



gvt-fixes-2018-01-08

- clear shadow entry for post-sync (Zhi)
- fix stack out-of-bound warning in cmd parser (Changbin)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180108061130.ucwtumhpbfbu4psu@zhen-hp.sh.intel.com
parents b2cd1df6 65e74392

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

+2 −2
Original line number Diff line number Diff line
@@ -2777,12 +2777,12 @@ int intel_gvt_scan_and_shadow_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) 
}



static struct cmd_info *find_cmd_entry_any_ring(struct intel_gvt *gvt,

		unsigned int opcode, int rings)

		unsigned int opcode, unsigned long rings)

{

	struct cmd_info *info = NULL;

	unsigned int ring;



	for_each_set_bit(ring, (unsigned long *)&rings, I915_NUM_ENGINES) {

	for_each_set_bit(ring, &rings, I915_NUM_ENGINES) {

		info = find_cmd_entry(gvt, opcode, ring);

		if (info)

			break;

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

+4 −1
Original line number Diff line number Diff line
@@ -1359,12 +1359,15 @@ static int ppgtt_handle_guest_write_page_table_bytes(void *gp, 
			return ret;

	} else {

		if (!test_bit(index, spt->post_shadow_bitmap)) {

			int type = spt->shadow_page.type;



			ppgtt_get_shadow_entry(spt, &se, index);

			ret = ppgtt_handle_guest_entry_removal(gpt, &se, index);

			if (ret)

				return ret;

			ops->set_pfn(&se, vgpu->gtt.scratch_pt[type].page_mfn);

			ppgtt_set_shadow_entry(spt, &se, index);

		}



		ppgtt_set_post_shadow(spt, index);

	}