diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-08-07 11:32:46 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-08-07 11:32:47 +0300 |
| commit | 5e2d0967acd3fcb202f70534bc4534c4e4216cfa (patch) | |
| tree | f00a1ca6f6f7291a0dad5e27fee7a44350046789 /drivers/gpu/drm/i915/gvt/scheduler.c | |
| parent | 5279fc7724ae3a82c9cfe5b09c1fb07ff0e41056 (diff) | |
| parent | d6086598d34e1cf9091c7be201f5b2041dc6203e (diff) | |
| download | linux-5e2d0967acd3fcb202f70534bc4534c4e4216cfa.tar.gz linux-5e2d0967acd3fcb202f70534bc4534c4e4216cfa.tar.bz2 linux-5e2d0967acd3fcb202f70534bc4534c4e4216cfa.zip | |
Merge tag 'gvt-fixes-2017-08-07' of https://github.com/01org/gvt-linux into drm-intel-fixes
gvt-fixes-2017-08-07
- two regression fixes for 65f9f6febf12, one is for display MMIO
initial value (Tina), another for 64bit MMIO access (Xiong)
- two reset fixes from Chuanxiao
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170807080716.qljcvws6opydnotk@zhen-hp.sh.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/scheduler.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/scheduler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index 4f7057d62d88..22e08eb2d0b7 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -432,7 +432,8 @@ static void complete_current_workload(struct intel_gvt *gvt, int ring_id) i915_gem_request_put(fetch_and_zero(&workload->req)); - if (!workload->status && !vgpu->resetting) { + if (!workload->status && !(vgpu->resetting_eng & + ENGINE_MASK(ring_id))) { update_guest_context(workload); for_each_set_bit(event, workload->pending_events, |