Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/xe/pm: Restore display pm if there is error after display suspend
@ 2025-07-07  1:58 Shuicheng Lin
  2025-07-07  2:07 ` ✓ CI.KUnit: success for " Patchwork
                   ` (5 more replies)
  0 siblings, 6 replies; 10+ messages in thread
From: Shuicheng Lin @ 2025-07-07  1:58 UTC (permalink / raw)
  To: intel-xe; +Cc: Shuicheng Lin, Daniele Ceraolo Spurio, John Harrison

xe_bo_evict_all() is called after xe_display_pm_suspend(). So if there
is error with xe_bo_evict_all(), display pm should be restored.

Fixes: 51462211f4a9 ("drm/xe/pxp: add PXP PM support")
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
 drivers/gpu/drm/xe/xe_pm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index ff749edc005b..bcfda545e74f 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -134,7 +134,7 @@ int xe_pm_suspend(struct xe_device *xe)
 	/* FIXME: Super racey... */
 	err = xe_bo_evict_all(xe);
 	if (err)
-		goto err_pxp;
+		goto err_display;
 
 	for_each_gt(gt, xe, id) {
 		err = xe_gt_suspend(gt);
@@ -151,7 +151,6 @@ int xe_pm_suspend(struct xe_device *xe)
 
 err_display:
 	xe_display_pm_resume(xe);
-err_pxp:
 	xe_pxp_pm_resume(xe->pxp);
 err:
 	drm_dbg(&xe->drm, "Device suspend failed %d\n", err);
-- 
2.49.0


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2025-07-09  0:54 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-07  1:58 [PATCH] drm/xe/pm: Restore display pm if there is error after display suspend Shuicheng Lin
2025-07-07  2:07 ` ✓ CI.KUnit: success for " Patchwork
2025-07-07 16:11 ` [PATCH] " Daniele Ceraolo Spurio
2025-07-08  2:36   ` Lin, Shuicheng
2025-07-08 20:08   ` Rodrigo Vivi
2025-07-09  0:54     ` Lin, Shuicheng
2025-07-08  3:54 ` [PATCH v2] " Shuicheng Lin
2025-07-08  4:01 ` ✓ CI.KUnit: success for drm/xe/pm: Restore display pm if there is error after display suspend (rev2) Patchwork
2025-07-08  4:42 ` ✓ Xe.CI.BAT: " Patchwork
2025-07-08  5:50 ` ✗ Xe.CI.Full: failure " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox