Skip to content

Commit 00f6a86

Browse files
committed
drm/xe: Move drm_dev_unplug() out of display function
This is not really display-related and needed for any sequence on driver removal that has to interact with drm_dev_enter()/drm_dev_exit(). Just remove xe_device_remove_display() and inline it in the single caller to make clear this is not done only for display. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Tejas Upadhyay <tejas.upadhyay@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250213192909.996148-10-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
1 parent d3f557d commit 00f6a86

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/gpu/drm/xe/xe_device.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -963,20 +963,16 @@ int xe_device_add_action_or_reset(struct xe_device *xe,
963963
return 0;
964964
}
965965

966-
static void xe_device_remove_display(struct xe_device *xe)
966+
void xe_device_remove(struct xe_device *xe)
967967
{
968968
xe_display_unregister(xe);
969969

970970
drm_dev_unplug(&xe->drm);
971+
971972
xe_display_driver_remove(xe);
972-
}
973973

974-
void xe_device_remove(struct xe_device *xe)
975-
{
976974
xe_oa_unregister(xe);
977975

978-
xe_device_remove_display(xe);
979-
980976
xe_heci_gsc_fini(xe);
981977

982978
xe_device_call_remove_actions(xe);

0 commit comments

Comments
 (0)