Commit 4071e087 authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

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



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: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510203810.1952-3-michal.wajdeczko@intel.com
parent 3df01f5c

drivers/gpu/drm/xe/xe_guc.c

+9 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/xe/xe_uc.c

+3 −7
Original line number Diff line number Diff line
@@ -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;

}