Merge drm/drm-next into drm-intel-gt-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 5118dc8386b27e9602e858bfd75f43b0fcf8c037..92bccc5623a895a2dfd4845d9a45acaca7c7be30 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -631,6 +631,8 @@ err_mem_regions:
        intel_memory_regions_driver_release(dev_priv);
 err_ggtt:
        i915_ggtt_driver_release(dev_priv);
+       i915_gem_drain_freed_objects(dev_priv);
+       i915_ggtt_driver_late_release(dev_priv);
 err_perf:
        i915_perf_fini(dev_priv);
        return ret;
@@ -880,6 +882,8 @@ out_cleanup_hw:
        i915_driver_hw_remove(i915);
        intel_memory_regions_driver_release(i915);
        i915_ggtt_driver_release(i915);
+       i915_gem_drain_freed_objects(i915);
+       i915_ggtt_driver_late_release(i915);
 out_cleanup_mmio:
        i915_driver_mmio_release(i915);
 out_runtime_pm_put:
@@ -936,6 +940,7 @@ static void i915_driver_release(struct drm_device *dev)
        intel_memory_regions_driver_release(dev_priv);
        i915_ggtt_driver_release(dev_priv);
        i915_gem_drain_freed_objects(dev_priv);
+       i915_ggtt_driver_late_release(dev_priv);
 
        i915_driver_mmio_release(dev_priv);