Skip to content

Commit de61d59

Browse files
mwajdeczlucasdemarchi
authored andcommitted
drm/xe/vf: Rename sriov_update_device_info
This is a VF only function and its name should reflect that to avoid any confusion. Move the VF check to the caller side. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com> Link: https://lore.kernel.org/r/20250928174811.198933-2-michal.wajdeczko@intel.com (cherry picked from commit b88bb1eefa88f0cefc00fe5e78b1186cd8f9db78) Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
1 parent 59b7ed0 commit de61d59

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

drivers/gpu/drm/xe/xe_device.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -685,16 +685,15 @@ static int wait_for_lmem_ready(struct xe_device *xe)
685685
}
686686
ALLOW_ERROR_INJECTION(wait_for_lmem_ready, ERRNO); /* See xe_pci_probe() */
687687

688-
static void sriov_update_device_info(struct xe_device *xe)
688+
static void vf_update_device_info(struct xe_device *xe)
689689
{
690+
xe_assert(xe, IS_SRIOV_VF(xe));
690691
/* disable features that are not available/applicable to VFs */
691-
if (IS_SRIOV_VF(xe)) {
692-
xe->info.probe_display = 0;
693-
xe->info.has_heci_cscfi = 0;
694-
xe->info.has_heci_gscfi = 0;
695-
xe->info.skip_guc_pc = 1;
696-
xe->info.skip_pcode = 1;
697-
}
692+
xe->info.probe_display = 0;
693+
xe->info.has_heci_cscfi = 0;
694+
xe->info.has_heci_gscfi = 0;
695+
xe->info.skip_guc_pc = 1;
696+
xe->info.skip_pcode = 1;
698697
}
699698

700699
static int xe_device_vram_alloc(struct xe_device *xe)
@@ -735,7 +734,8 @@ int xe_device_probe_early(struct xe_device *xe)
735734

736735
xe_sriov_probe_early(xe);
737736

738-
sriov_update_device_info(xe);
737+
if (IS_SRIOV_VF(xe))
738+
vf_update_device_info(xe);
739739

740740
err = xe_pcode_probe_early(xe);
741741
if (err || xe_survivability_mode_is_requested(xe)) {

0 commit comments

Comments
 (0)