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

Commit 3d72e27a authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-fixes-2017-05-11' of https://github.com/01org/gvt-linux into drm-intel-fixes 



gvt-fixes-2017-05-11

- vGPU scheduler performance regression fix (Ping)
- bypass in-context mmio restore (Chuanxiao)
- one typo fix (Colin)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170511054736.swpcmnzdoqi75cnl@zhen-hp.sh.intel.com
parents 2ea659a9 ae157902

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

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ static int dma_ctrl_write(struct intel_vgpu *vgpu, unsigned int offset, 
	mode = vgpu_vreg(vgpu, offset);



	if (GFX_MODE_BIT_SET_IN_MASK(mode, START_DMA)) {

		WARN_ONCE(1, "VM(%d): iGVT-g doesn't supporte GuC\n",

		WARN_ONCE(1, "VM(%d): iGVT-g doesn't support GuC\n",

				vgpu->id);

		return 0;

	}

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

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ void intel_gvt_restore_render_mmio(struct intel_vgpu *vgpu, int ring_id) 
		} else

			v = mmio->value;



		if (mmio->in_context)

			continue;



		I915_WRITE(mmio->reg, v);

		POSTING_READ(mmio->reg);

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

+6 −2
Original line number Diff line number Diff line
@@ -129,9 +129,13 @@ static void try_to_schedule_next_vgpu(struct intel_gvt *gvt) 
	struct vgpu_sched_data *vgpu_data;

	ktime_t cur_time;



	/* no target to schedule */

	if (!scheduler->next_vgpu)

	/* no need to schedule if next_vgpu is the same with current_vgpu,

	 * let scheduler chose next_vgpu again by setting it to NULL.

	 */

	if (scheduler->next_vgpu == scheduler->current_vgpu) {

		scheduler->next_vgpu = NULL;

		return;

	}



	/*

	 * after the flag is set, workload dispatch thread will