Skip to content

Commit

Permalink
drm/xe: Add dbg messages on the suspend resume functions.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
rodrigovivi committed Mar 19, 2024
1 parent 2920c2c commit f7f24b7
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions drivers/gpu/drm/xe/xe_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,29 +80,35 @@ 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);

for_each_gt(gt, xe, id) {
err = xe_gt_suspend(gt);
if (err) {
xe_display_pm_resume(xe);
return err;
goto err;
}
}

xe_irq_suspend(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;
}

/**
Expand All @@ -118,13 +124,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);
Expand All @@ -135,7 +143,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);

Expand All @@ -146,9 +154,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 xe_device *xe)
Expand Down

0 comments on commit f7f24b7

Please sign in to comment.