Proxmox-Port/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-09-04 10:20:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/xe/uc: Disable GuC communication on hardware initialization error

Browse Source 
Disable GuC communication on Xe micro controller hardware initialization
error.

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/4917
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250707231108.3217573-1-zhanjun.dong@intel.com
This commit is contained in:
Zhanjun Dong 2025-07-07 19:11:08 -04:00 committed by Matthew Brost
parent 83dcee1785
commit b2c4ac219f
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/xe/xe_guc.c
View File

@ -1219,13 +1219,17 @@ static int vf_guc_min_load_for_hwconfig(struct xe_guc *guc)
ret = xe_gt_sriov_vf_connect(gt); ret = xe_gt_sriov_vf_connect(gt);
if (ret) if (ret)
return ret; goto err_out;
ret = xe_gt_sriov_vf_query_runtime(gt); ret = xe_gt_sriov_vf_query_runtime(gt);
if (ret) if (ret)
return ret; goto err_out;
return 0; return 0;
err_out:
xe_guc_sanitize(guc);
return ret;
} }
/** /**

18
drivers/gpu/drm/xe/xe_uc.c
View File

@ -158,7 +158,7 @@ static int vf_uc_load_hw(struct xe_uc *uc)
err = xe_gt_sriov_vf_connect(uc_to_gt(uc)); err = xe_gt_sriov_vf_connect(uc_to_gt(uc));
if (err) if (err)
return err; goto err_out;
uc->guc.submission_state.enabled = true; uc->guc.submission_state.enabled = true;
@ -168,9 +168,13 @@ static int vf_uc_load_hw(struct xe_uc *uc)
err = xe_gt_record_default_lrcs(uc_to_gt(uc)); err = xe_gt_record_default_lrcs(uc_to_gt(uc));
if (err) if (err)
return err; goto err_out;
return 0; return 0;
err_out:
xe_guc_sanitize(&uc->guc);
return err;
} }
/* /*
@ -202,15 +206,15 @@ int xe_uc_load_hw(struct xe_uc *uc)
ret = xe_gt_record_default_lrcs(uc_to_gt(uc)); ret = xe_gt_record_default_lrcs(uc_to_gt(uc));
if (ret) if (ret)
return ret; goto err_out;
ret = xe_guc_post_load_init(&uc->guc); ret = xe_guc_post_load_init(&uc->guc);
if (ret) if (ret)
return ret; goto err_out;
ret = xe_guc_pc_start(&uc->guc.pc); ret = xe_guc_pc_start(&uc->guc.pc);
if (ret) if (ret)
return ret; goto err_out;
xe_guc_engine_activity_enable_stats(&uc->guc); xe_guc_engine_activity_enable_stats(&uc->guc);
@ -222,6 +226,10 @@ int xe_uc_load_hw(struct xe_uc *uc)
xe_gsc_load_start(&uc->gsc); xe_gsc_load_start(&uc->gsc);
return 0; return 0;
err_out:
xe_guc_sanitize(&uc->guc);
return ret;
} }
int xe_uc_reset_prepare(struct xe_uc *uc) int xe_uc_reset_prepare(struct xe_uc *uc)