mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
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: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170511054736.swpcmnzdoqi75cnl@zhen-hp.sh.intel.com
This commit is contained in:
commit
3d72e27a3a
3 changed files with 10 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue