The display driver init and cleanup calls are slightly asymmetric. The
cleanup order should be intel_display_driver_remove_noirq() and
intel_display_driver_remove_nogem(), not the other way around. This is
also what i915 does. Follow suit in xe.

Signed-off-by: Jani Nikula <[email protected]>
---
 drivers/gpu/drm/xe/display/xe_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c 
b/drivers/gpu/drm/xe/display/xe_display.c
index 4a621779fc53..0d93784754c1 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -82,8 +82,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);
 }
-- 
2.47.3

Reply via email to