[PATCH] drm/xe/guc: Disable ct on xe micro hardware init error
Zhanjun Dong
zhanjun.dong at intel.com
Tue Jun 3 23:45:10 UTC 2025
Disable ct if xe micro controller hardware init failed.
Signed-off-by: Zhanjun Dong <zhanjun.dong at intel.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/4917
---
drivers/gpu/drm/xe/xe_uc.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
index 3a8751a8b92d..ba72c1b30f2f 100644
--- a/drivers/gpu/drm/xe/xe_uc.c
+++ b/drivers/gpu/drm/xe/xe_uc.c
@@ -13,6 +13,7 @@
#include "xe_gt_printk.h"
#include "xe_gt_sriov_vf.h"
#include "xe_guc.h"
+#include "xe_guc_ct.h"
#include "xe_guc_pc.h"
#include "xe_guc_engine_activity.h"
#include "xe_huc.h"
@@ -189,27 +190,27 @@ int xe_uc_init_hw(struct xe_uc *uc)
ret = xe_huc_upload(&uc->huc);
if (ret)
- return ret;
+ goto err;
ret = xe_guc_upload(&uc->guc);
if (ret)
- return ret;
+ goto err;
ret = xe_guc_enable_communication(&uc->guc);
if (ret)
- return ret;
+ goto err;
ret = xe_gt_record_default_lrcs(uc_to_gt(uc));
if (ret)
- return ret;
+ goto err;
ret = xe_guc_post_load_init(&uc->guc);
if (ret)
- return ret;
+ goto err;
ret = xe_guc_pc_start(&uc->guc.pc);
if (ret)
- return ret;
+ goto err;
xe_guc_engine_activity_enable_stats(&uc->guc);
@@ -221,6 +222,9 @@ int xe_uc_init_hw(struct xe_uc *uc)
xe_gsc_load_start(&uc->gsc);
return 0;
+err:
+ xe_guc_ct_disable(&uc->guc.ct);
+ return ret;
}
int xe_uc_fini_hw(struct xe_uc *uc)
--
2.34.1
More information about the Intel-xe
mailing list