Skip to content

Commit 83dcee1

Browse files
ShuichengLinrodrigovivi
authored andcommitted
drm/xe/pm: Restore display pm if there is error after display suspend
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: 5146221 ("drm/xe/pxp: add PXP PM support") Fixes: cb8f81c ("drm/xe/display: Make display suspend/resume work on discrete") Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> 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> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Link: https://lore.kernel.org/r/20250708035424.3608190-2-shuicheng.lin@intel.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 94de1df commit 83dcee1

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/xe/xe_pm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ int xe_pm_suspend(struct xe_device *xe)
134134
/* FIXME: Super racey... */
135135
err = xe_bo_evict_all(xe);
136136
if (err)
137-
goto err_pxp;
137+
goto err_display;
138138

139139
for_each_gt(gt, xe, id) {
140140
err = xe_gt_suspend(gt);
@@ -151,7 +151,6 @@ int xe_pm_suspend(struct xe_device *xe)
151151

152152
err_display:
153153
xe_display_pm_resume(xe);
154-
err_pxp:
155154
xe_pxp_pm_resume(xe->pxp);
156155
err:
157156
drm_dbg(&xe->drm, "Device suspend failed %d\n", err);

0 commit comments

Comments
 (0)