diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index b99247ef8a6e..f0f148a3bcb3 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -103,8 +103,8 @@ static void xe_display_fini_early(void *arg)
 		return;
 
 	intel_hpd_cancel_work(display);
-	intel_display_driver_remove_nogem(display);
 	intel_display_driver_remove_noirq(display);
+	intel_display_driver_remove_nogem(display);
 	intel_opregion_cleanup(display);
 	intel_display_power_cleanup(display);
 }