mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 04:34:03 +02:00
drm/{i915, xe}: move intel_hpd_cancel_work() to intel_display_driver_remove_noirq()
intel_hpd_cancel_work() gets called before intel_display_driver_remove_noirq(). Move it there. Reviewed-by: Michał Grzelak <michal.grzelak@intel.com> Link: https://patch.msgid.link/6be8d033a6c8d0038dc14100d3ee6612d6204770.1781549229.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
a6ad0edf83
commit
3bf0abfbdd
|
|
@ -622,6 +622,8 @@ void intel_display_driver_remove_noirq(struct intel_display *display)
|
|||
if (!HAS_DISPLAY(display))
|
||||
return;
|
||||
|
||||
intel_hpd_cancel_work(display);
|
||||
|
||||
intel_display_driver_suspend_access(display);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -948,7 +948,6 @@ void i915_driver_remove(struct drm_i915_private *i915)
|
|||
intel_display_driver_remove(display);
|
||||
|
||||
intel_irq_uninstall(i915);
|
||||
intel_hpd_cancel_work(display);
|
||||
|
||||
intel_display_driver_remove_noirq(display);
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ static void xe_display_fini_early(void *arg)
|
|||
if (!xe->info.probe_display)
|
||||
return;
|
||||
|
||||
intel_hpd_cancel_work(display);
|
||||
intel_display_driver_remove_noirq(display);
|
||||
intel_display_driver_remove_nogem(display);
|
||||
intel_display_power_cleanup(display);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user