Skip to content

Commit

Permalink
drm/i915: Disable outputs during unregister
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Chris Wilson committed Dec 4, 2020
1 parent 0056502 commit 9d8fddf
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9d8fddf

Please sign in to comment.