mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-17 12:30:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe: Remove xe_uc_init_hwconfig()

Browse Source 
This function is called immediately after xe_uc_init(), so just put it
there instead.

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250619104858.418440-22-dev@lankhorst.se
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
This commit is contained in:
Maarten Lankhorst
2025-06-19 12:49:08 +02:00
parent 3effd109c6
commit 80fa03eb8a
3 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/xe/xe_gt.c
View File

@@ -466,10 +466,6 @@ static int gt_init_with_gt_forcewake(struct xe_gt *gt)
if (err)
goto err_force_wake;
err = xe_uc_init_hwconfig(&gt->uc);
if (err)
goto err_force_wake;
xe_gt_topology_init(gt);
xe_gt_mcr_init(gt);
xe_gt_enable_host_l2_vram(gt);

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

@@ -72,15 +72,17 @@ int xe_uc_init(struct xe_uc *uc)
if (!xe_device_uc_enabled(uc_to_xe(uc)))
return 0;
if (IS_SRIOV_VF(uc_to_xe(uc)))
return 0;
if (!IS_SRIOV_VF(uc_to_xe(uc))) {
ret = xe_wopcm_init(&uc->wopcm);
if (ret)
goto err;
}
ret = xe_wopcm_init(&uc->wopcm);
ret = xe_guc_min_load_for_hwconfig(&uc->guc);
if (ret)
goto err;
return 0;
err:
xe_gt_err(uc_to_gt(uc), "Failed to initialize uC (%pe)\n", ERR_PTR(ret));
return ret;
@@ -142,27 +144,6 @@ int xe_uc_sanitize_reset(struct xe_uc *uc)
return uc_reset(uc);
}
/**
* xe_uc_init_hwconfig - minimally init Uc, read and parse hwconfig
* @uc: The UC object
*
* Return: 0 on success, negative error code on error.
*/
int xe_uc_init_hwconfig(struct xe_uc *uc)
{
int ret;
/* GuC submission not enabled, nothing to do */
if (!xe_device_uc_enabled(uc_to_xe(uc)))
return 0;
ret = xe_guc_min_load_for_hwconfig(&uc->guc);
if (ret)
return ret;
return 0;
}
static int vf_uc_init_hw(struct xe_uc *uc)
{
int err;

1
drivers/gpu/drm/xe/xe_uc.h
View File

@@ -10,7 +10,6 @@ struct xe_uc;
int xe_uc_init_noalloc(struct xe_uc *uc);
int xe_uc_init(struct xe_uc *uc);
int xe_uc_init_hwconfig(struct xe_uc *uc);
int xe_uc_init_post_hwconfig(struct xe_uc *uc);
int xe_uc_init_hw(struct xe_uc *uc);
int xe_uc_fini_hw(struct xe_uc *uc);