diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-05 03:45:27 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-05 03:45:32 +0300 |
| commit | 23b5f422e8f42d9d3b7063c05c839a8b0ff5adf5 (patch) | |
| tree | 24031152e7229436684791f5a979f29c12cd8247 /drivers/gpu/drm/i915/gvt/scheduler.c | |
| parent | 2ded18812bb17da13e68a425053ab10c4457707a (diff) | |
| parent | 57cbec02f9b10992319ca578797c8059ac47d71e (diff) | |
| download | linux-23b5f422e8f42d9d3b7063c05c839a8b0ff5adf5.tar.xz | |
Merge tag 'drm-intel-fixes-2019-04-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Only one fix for DSC (backoff after drm_modeset_lock deadlock)
and GVT's fixes including vGPU display plane size calculation,
shadow mm pin count, error recovery path for workload create
and one kerneldoc fix.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190404161116.GA14522@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/scheduler.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/scheduler.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index 159192c097cc..05b953793316 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -1486,8 +1486,9 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id, intel_runtime_pm_put_unchecked(dev_priv); } - if (ret && (vgpu_is_vm_unhealthy(ret))) { - enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR); + if (ret) { + if (vgpu_is_vm_unhealthy(ret)) + enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR); intel_vgpu_destroy_workload(workload); return ERR_PTR(ret); } |