1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/gvt/gvt.c b/drivers/gpu/drm/i915/gvt/gvt.c
index 712f9d14e720..46c8b720e336 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.c
+++ b/drivers/gpu/drm/i915/gvt/gvt.c
@@ -176,6 +176,7 @@ static const struct intel_gvt_ops intel_gvt_ops = {
         .emulate_mmio_write = intel_vgpu_emulate_mmio_write,
         .vgpu_create = intel_gvt_create_vgpu,
         .vgpu_destroy = intel_gvt_destroy_vgpu,
+        .vgpu_release = intel_gvt_release_vgpu,
         .vgpu_reset = intel_gvt_reset_vgpu,
         .vgpu_activate = intel_gvt_activate_vgpu,
         .vgpu_deactivate = intel_gvt_deactivate_vgpu,
@@ -315,6 +316,11 @@ void intel_gvt_clean_device(struct drm_i915_private *dev_priv)
         if (WARN_ON(!gvt))
                 return;
 
+        intel_gvt_destroy_idle_vgpu(gvt->idle_vgpu);
+        intel_gvt_hypervisor_host_exit(&dev_priv->drm.pdev->dev, gvt);
+        intel_gvt_cleanup_vgpu_type_groups(gvt);
+        intel_gvt_clean_vgpu_types(gvt);
+
         intel_gvt_debugfs_clean(gvt);
         clean_service_thread(gvt);
         intel_gvt_clean_cmd_parser(gvt);
@@ -322,17 +328,10 @@ void intel_gvt_clean_device(struct drm_i915_private *dev_priv)
         intel_gvt_clean_workload_scheduler(gvt);
         intel_gvt_clean_gtt(gvt);
         intel_gvt_clean_irq(gvt);
-        intel_gvt_clean_mmio_info(gvt);
         intel_gvt_free_firmware(gvt);
-
-        intel_gvt_hypervisor_host_exit(&dev_priv->drm.pdev->dev, gvt);
-        intel_gvt_cleanup_vgpu_type_groups(gvt);
-        intel_gvt_clean_vgpu_types(gvt);
-
+        intel_gvt_clean_mmio_info(gvt);
         idr_destroy(&gvt->vgpu_idr);
 
-        intel_gvt_destroy_idle_vgpu(gvt->idle_vgpu);
-
         kfree(dev_priv->gvt);
         dev_priv->gvt = NULL;
 }