Skip to content

Commit

Permalink
drm/i915: Move audio deinit after disabling polling
Browse files Browse the repository at this point in the history
Deinitialize audio during driver unload after disabling polling. This is
in preparation to do all the display HW init/deinit steps at a point
where no HPD IRQ or polling initiated connector detection or modeset can
change the HW state. This may still happen here via an HPD IRQ ->
hotplug detection work or a connector sysfs (state/detect) access, but
these will be prevented by later changes in this patchset.

Link: https://patchwork.freedesktop.org/patch/msgid/20240104083008.2715733-4-imre.deak@intel.com
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
  • Loading branch information
Imre Deak committed Jan 8, 2024
1 parent f7d16a5 commit a1a0e86
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/gpu/drm/i915/display/intel_display_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,14 +486,15 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)
return;

intel_fbdev_unregister(i915);
intel_audio_deinit(i915);

/*
* After flushing the fbdev (incl. a late async config which
* will have delayed queuing of a hotplug event), then flush
* the hotplug events.
*/
drm_kms_helper_poll_fini(&i915->drm);

intel_audio_deinit(i915);

drm_atomic_helper_shutdown(&i915->drm);

acpi_video_unregister();
Expand Down

0 comments on commit a1a0e86

Please sign in to comment.