Commit 00f6a86c authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

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: default avatarTejas Upadhyay <tejas.upadhyay@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213192909.996148-10-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent d3f557d5

drivers/gpu/drm/xe/xe_device.c

+2 −6
Original line number Diff line number Diff line
@@ -963,20 +963,16 @@ int xe_device_add_action_or_reset(struct xe_device *xe, 
	return 0;

}



static void xe_device_remove_display(struct xe_device *xe)

void xe_device_remove(struct xe_device *xe)

{

	xe_display_unregister(xe);



	drm_dev_unplug(&xe->drm);



	xe_display_driver_remove(xe);

}



void xe_device_remove(struct xe_device *xe)

{

	xe_oa_unregister(xe);



	xe_device_remove_display(xe);



	xe_heci_gsc_fini(xe);



	xe_device_call_remove_actions(xe);