Commit 055e94a8 authored by Stanley.Yang's avatar Stanley.Yang Committed by Alex Deucher
Browse files

drm/amdgpu: only skip smc sdma sos ta and asd fw in SRIOV for navi12 



The KFDTopologyTest.BasicTest will failed if skip smc, sdma, sos, ta
and asd fw in SRIOV for vega10, so adjust above fw and skip load them
in SRIOV only for navi12.

v2: remove unnecessary asic type check.

Signed-off-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9ccde05c

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

+0 −3
Original line number Diff line number Diff line
@@ -593,9 +593,6 @@ static int sdma_v4_0_init_microcode(struct amdgpu_device *adev) 
	struct amdgpu_firmware_info *info = NULL;

	const struct common_firmware_header *header = NULL;



	if (amdgpu_sriov_vf(adev))

		return 0;



	DRM_DEBUG("\n");



	switch (adev->asic_type) {

drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int sdma_v5_0_init_microcode(struct amdgpu_device *adev) 
	const struct common_firmware_header *header = NULL;

	const struct sdma_firmware_header_v1_0 *hdr;



	if (amdgpu_sriov_vf(adev))

	if (amdgpu_sriov_vf(adev) && (adev->asic_type == CHIP_NAVI12))

		return 0;



	DRM_DEBUG("\n");

drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c

+0 −3
Original line number Diff line number Diff line
@@ -153,9 +153,6 @@ static int sdma_v5_2_init_microcode(struct amdgpu_device *adev) 
	struct amdgpu_firmware_info *info = NULL;

	const struct common_firmware_header *header = NULL;



	if (amdgpu_sriov_vf(adev))

		return 0;



	DRM_DEBUG("\n");



	switch (adev->asic_type) {

drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.c

+5 −7
Original line number Diff line number Diff line
@@ -209,13 +209,11 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr) 
	int ret;

	struct cgs_firmware_info info = {0};



	if (!amdgpu_sriov_vf((struct amdgpu_device *)hwmgr->adev)) {

	ret = cgs_get_firmware_info(hwmgr->device,

					CGS_UCODE_ID_SMU,

					&info);

	if (ret || !info.kptr)

		return -EINVAL;

	}



	priv = kzalloc(sizeof(struct vega10_smumgr), GFP_KERNEL);

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static int smu_sw_init(void *handle) 
	smu->smu_dpm.dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;

	smu->smu_dpm.requested_dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;



	if (!amdgpu_sriov_vf(adev)) {

	if (!amdgpu_sriov_vf(adev) || (adev->asic_type != CHIP_NAVI12)) {

		ret = smu_init_microcode(smu);

		if (ret) {

			dev_err(adev->dev, "Failed to load smu firmware!\n");