iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe/uc: Move GuC submission init to post hwconfig step

Browse Source 
We shouldn't need anything from the GuC submission code until we
finish GuC initialization in post hwconfig step.

While around add diagnostic message if we fail uC init.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510203810.1952-3-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2024-05-10 22:38:10 +02:00
parent 3df01f5c72
commit 4071e0872f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@
#include "xe_gt_printk.h"
#include "xe_guc_ads.h"
#include "xe_guc_ct.h"
#include "xe_guc_db_mgr.h"
#include "xe_guc_hwconfig.h"
#include "xe_guc_log.h"
#include "xe_guc_pc.h"
@ -356,6 +357,14 @@ int xe_guc_init_post_hwconfig(struct xe_guc *guc)
guc_init_params_post_hwconfig(guc);
ret = xe_guc_submit_init(guc);
if (ret)
return ret;
ret = xe_guc_db_mgr_init(&guc->dbm, ~0);
if (ret)
return ret;
ret = xe_guc_pc_init(&guc->pc);
if (ret)
return ret;

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

@ -10,10 +10,9 @@
#include "xe_gsc.h"
#include "xe_gsc_proxy.h"
#include "xe_gt.h"
#include "xe_gt_printk.h"
#include "xe_guc.h"
#include "xe_guc_db_mgr.h"
#include "xe_guc_pc.h"
#include "xe_guc_submit.h"
#include "xe_huc.h"
#include "xe_uc_fw.h"
#include "xe_wopcm.h"
@ -58,13 +57,10 @@ int xe_uc_init(struct xe_uc *uc)
if (ret)
goto err;
ret = xe_guc_submit_init(&uc->guc);
if (ret)
goto err;
ret = xe_guc_db_mgr_init(&uc->guc.dbm, ~0);
return 0;
err:
xe_gt_err(uc_to_gt(uc), "Failed to initialize uC (%pe)\n", ERR_PTR(ret));
return ret;
}