From 1ed591582b7b894d2f7e7ab5cef2e9b0b6fef12b Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Wed, 12 Feb 2025 14:24:47 -0500 Subject: [PATCH] drm/xe/display: Remove hpd cancel work sync from runtime pm path This function will synchronously cancel and wait for many display work queue items, which might try to take the runtime pm reference causing a bad deadlock. So, remove it from the runtime_pm suspend patch. Reported-by: Imre Deak Reviewed-by: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20250212192447.402715-1-rodrigo.vivi@intel.com Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/display/xe_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 376c36ca06db..e144d8c0a123 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -312,7 +312,8 @@ static void __xe_display_pm_suspend(struct xe_device *xe, bool runtime) xe_display_flush_cleanup_work(xe); - intel_hpd_cancel_work(xe); + if (!runtime) + intel_hpd_cancel_work(xe); if (!runtime && has_display(xe)) { intel_display_driver_suspend_access(display); -- 2.50.1