Merge tag 'v4.10-rc2' into drm-intel-next-queued

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / i915 / gvt / scheduler.c

diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
index 4db24225023520b879b12fce1a924cc236384bd5..fd2b026f7ecde98a6da7c97ce855d972939a27b9 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -549,18 +549,10 @@ err:
 
 void intel_vgpu_clean_gvt_context(struct intel_vgpu *vgpu)
 {
-       struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
-
        atomic_notifier_chain_unregister(&vgpu->shadow_ctx->status_notifier,
                        &vgpu->shadow_ctx_notifier_block);
 
-       mutex_lock(&dev_priv->drm.struct_mutex);
-
-       /* a little hacky to mark as ctx closed */
-       vgpu->shadow_ctx->closed = true;
-       i915_gem_context_put(vgpu->shadow_ctx);
-
-       mutex_unlock(&dev_priv->drm.struct_mutex);
+       i915_gem_context_put_unlocked(vgpu->shadow_ctx);
 }
 
 int intel_vgpu_init_gvt_context(struct intel_vgpu *vgpu)