From: Rodrigo Vivi Date: Wed, 12 Feb 2025 19:24:47 +0000 (-0500) Subject: drm/xe/display: Remove hpd cancel work sync from runtime pm path X-Git-Tag: v6.14.9~312 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62c26a7d2ce4c1e015a86e23346f464f064bd7d2;p=thirdparty%2Fkernel%2Fstable.git drm/xe/display: Remove hpd cancel work sync from runtime pm path [ Upstream commit 1ed591582b7b894d2f7e7ab5cef2e9b0b6fef12b ] 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 Signed-off-by: Sasha Levin --- diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index b3921dbc52ff6..b735e30953cee 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -346,7 +346,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);