drm/i915: Disable outputs during unregister

Switch off the scanout during driver unregister, so we can shutdown the
HW immediately for unbind.

v2: Remove the old shutdown from remove, it should now be redundant.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201204161601.20897-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index abd49017aea18c2054c25f15d791e2fae4932638..7285634914fcd86e21c240fde372824b8467fe1a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -738,6 +738,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
         * events.
         */
        drm_kms_helper_poll_fini(&dev_priv->drm);
+       drm_atomic_helper_shutdown(&dev_priv->drm);
 
        intel_gt_driver_unregister(&dev_priv->gt);
        acpi_video_unregister();
@@ -940,8 +941,6 @@ void i915_driver_remove(struct drm_i915_private *i915)
 
        i915_gem_suspend(i915);
 
-       drm_atomic_helper_shutdown(&i915->drm);
-
        intel_gvt_driver_remove(i915);
 
        intel_modeset_driver_remove(i915);