Skip to content

Commit 1ed5915

Browse files
committed
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 <[email protected]> Reviewed-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent b744675 commit 1ed5915

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/xe/display/xe_display.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ static void __xe_display_pm_suspend(struct xe_device *xe, bool runtime)
312312

313313
xe_display_flush_cleanup_work(xe);
314314

315-
intel_hpd_cancel_work(xe);
315+
if (!runtime)
316+
intel_hpd_cancel_work(xe);
316317

317318
if (!runtime && has_display(xe)) {
318319
intel_display_driver_suspend_access(display);

0 commit comments

Comments
 (0)