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 <[email protected]>
Cc: Daniele Ceraolo Spurio <[email protected]>
Cc: John Harrison <[email protected]>
Signed-off-by: Shuicheng Lin <[email protected]>
Reviewed-by: Daniele Ceraolo Spurio <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Rodrigo Vivi <[email protected]>
(cherry picked from commit 83dcee1)
Signed-off-by: Lucas De Marchi <[email protected]>

Author: ShuichengLin

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);