github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe/sriov: Move VF bootstrap and query_config to vf_guc_init

Browse Source 
We want to split up GUC init to an alloc and noalloc part to keep the
init path the same for VF and !VF as much as possible.

Everything in vf_guc_init should be done as early as possible, otherwise
VRAM probing becomes impossible.

Also move xe_gt_mmio_init to the end of xe_gt_init_early(), cleaning up
the init in xe_device slightly.

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250619104858.418440-15-dev@lankhorst.se
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
This commit is contained in:
Maarten Lankhorst 2025-06-19 12:49:01 +02:00
parent e6018b194b
commit b3412d7233
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/xe/xe_device.c
View File

@ -792,23 +792,6 @@ int xe_device_probe(struct xe_device *xe)
err = xe_gt_init_early(gt);
if (err)
return err;
/*
* Only after this point can GT-specific MMIO operations
* (including things like communication with the GuC)
* be performed.
*/
xe_gt_mmio_init(gt);
if (IS_SRIOV_VF(xe)) {
xe_guc_comm_init_early(&gt->uc.guc);
err = xe_gt_sriov_vf_bootstrap(gt);
if (err)
return err;
err = xe_gt_sriov_vf_query_config(gt);
if (err)
return err;
}
}
for_each_tile(tile, xe, id) {

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

@ -419,6 +419,13 @@ int xe_gt_init_early(struct xe_gt *gt)
xe_mocs_init_early(gt);
/*
* Only after this point can GT-specific MMIO operations
* (including things like communication with the GuC)
* be performed.
*/
xe_gt_mmio_init(gt);
return 0;
}

1
drivers/gpu/drm/xe/xe_gt_sriov_vf.c
View File

@ -966,7 +966,6 @@ u32 xe_gt_sriov_vf_read32(struct xe_gt *gt, struct xe_reg reg)
struct vf_runtime_reg *rr;
xe_gt_assert(gt, IS_SRIOV_VF(gt_to_xe(gt)));
xe_gt_assert(gt, gt->sriov.vf.pf_version.major);
xe_gt_assert(gt, !reg.vf);
if (reg.addr == GMD_ID.addr) {

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

@ -629,6 +629,7 @@ static int xe_guc_realloc_post_hwconfig(struct xe_guc *guc)
static int vf_guc_init(struct xe_guc *guc)
{
struct xe_gt *gt = guc_to_gt(guc);
int err;
xe_guc_comm_init_early(guc);
@ -641,6 +642,14 @@ static int vf_guc_init(struct xe_guc *guc)
if (err)
return err;
err = xe_gt_sriov_vf_bootstrap(gt);
if (err)
return err;
err = xe_gt_sriov_vf_query_config(gt);
if (err)
return err;
return 0;
}