drm/xe: Restore GT freq on GSC load error

As part of a Wa_22019338487, ensure that GT freq is restored
even when GSC reload is not successful.

Fixes: 3b1592fb7835 ("drm/xe/lnl: Apply Wa_22019338487")
Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240925204918.1989574-1-vinay.belgaumkar@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 274737417b0fd4f4b062a48c67a2baee40301f50..c6b6c585c57df0ef729a8d53b126d8fba850bf58 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -907,7 +907,9 @@ int xe_gt_sanitize_freq(struct xe_gt *gt)
        int ret = 0;
 
        if ((!xe_uc_fw_is_available(&gt->uc.gsc.fw) ||
-            xe_uc_fw_is_loaded(&gt->uc.gsc.fw)) && XE_WA(gt, 22019338487))
+            xe_uc_fw_is_loaded(&gt->uc.gsc.fw) ||
+            xe_uc_fw_is_in_error_state(&gt->uc.gsc.fw)) &&
+           XE_WA(gt, 22019338487))
                ret = xe_guc_pc_restore_stashed_freq(&gt->uc.guc.pc);
 
        return ret;