Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -6
+2 -6
drivers/gpu/drm/xe/xe_device.c
··· 963 963 return 0; 964 964 } 965 965 966 - static void xe_device_remove_display(struct xe_device *xe) 966 + void xe_device_remove(struct xe_device *xe) 967 967 { 968 968 xe_display_unregister(xe); 969 969 970 970 drm_dev_unplug(&xe->drm); 971 + 971 972 xe_display_driver_remove(xe); 972 - } 973 973 974 - void xe_device_remove(struct xe_device *xe) 975 - { 976 974 xe_oa_unregister(xe); 977 - 978 - xe_device_remove_display(xe); 979 975 980 976 xe_heci_gsc_fini(xe); 981 977