tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe: Add dbg messages on the suspend resume functions.

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2073603

[ Upstream commit f7f24b7950af4b1548ad5075ddb13eeb333bb782 ]

In case of the suspend/resume flow getting locked up we
can get reports with some useful hints on where it might
get locked and if that has failed.

Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240318180141.267458-2-rodrigo.vivi@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Stable-dep-of: 77b79df0268b ("drm/xe: Change pcode timeout to 50msec while polling again")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
Rodrigo Vivi
2024-03-18 14:01:41 -04:00
committed by Roxana Nicolescu
parent e0bf62a2af
commit 3f4e6ba658
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/xe/xe_pm.c
+17 -5
View File
@@ -54,13 +54,15 @@ int xe_pm_suspend(struct xe_device *xe)
u8 id;
int err;
drm_dbg(&xe->drm, "Suspending device\n");
for_each_gt(gt, xe, id)
xe_gt_suspend_prepare(gt);
/* FIXME: Super racey... */
err = xe_bo_evict_all(xe);
if (err)
return err;
goto err;
xe_display_pm_suspend(xe);
@@ -68,7 +70,7 @@ int xe_pm_suspend(struct xe_device *xe)
err = xe_gt_suspend(gt);
if (err) {
xe_display_pm_resume(xe);
return err;
goto err;
}
}
@@ -76,7 +78,11 @@ int xe_pm_suspend(struct xe_device *xe)
xe_display_pm_suspend_late(xe);
drm_dbg(&xe->drm, "Device suspended\n");
return 0;
err:
drm_dbg(&xe->drm, "Device suspend failed %d\n", err);
return err;
}
/**
@@ -92,13 +98,15 @@ int xe_pm_resume(struct xe_device *xe)
u8 id;
int err;
drm_dbg(&xe->drm, "Resuming device\n");
for_each_tile(tile, xe, id)
xe_wa_apply_tile_workarounds(tile);
for_each_gt(gt, xe, id) {
err = xe_pcode_init(gt);
if (err)
return err;
goto err;
}
xe_display_pm_resume_early(xe);
@@ -109,7 +117,7 @@ int xe_pm_resume(struct xe_device *xe)
*/
err = xe_bo_restore_kernel(xe);
if (err)
return err;
goto err;
xe_irq_resume(xe);
@@ -120,9 +128,13 @@ int xe_pm_resume(struct xe_device *xe)
err = xe_bo_restore_user(xe);
if (err)
return err;
goto err;
drm_dbg(&xe->drm, "Device resumed\n");
return 0;
err:
drm_dbg(&xe->drm, "Device resume failed %d\n", err);
return err;
}
static bool xe_pm_pci_d3cold_capable(struct pci_dev *pdev)