Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b87c032b authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/smu: skip SMC ucode loading on SR-IOV capable boards (v2) 



VBIOS does this for us in asic_init.

v2: update iceland as well

Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c12d2871

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

+6 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ static int fiji_smu_upload_firmware_image(struct amdgpu_device *adev) 
	if (!adev->pm.fw)

		return -EINVAL;



	/* Skip SMC ucode loading on SR-IOV capable boards.

	 * vbios does this for us in asic_init in that case.

	 */

	if (adev->virtualization.supports_sr_iov)

		return 0;



	hdr = (const struct smc_firmware_header_v1_0 *)adev->pm.fw->data;

	amdgpu_ucode_print_smc_hdr(&hdr->header);

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

+6 −0
Original line number Diff line number Diff line
@@ -279,6 +279,12 @@ static int iceland_smu_upload_firmware_image(struct amdgpu_device *adev) 
	if (!adev->pm.fw)

		return -EINVAL;



	/* Skip SMC ucode loading on SR-IOV capable boards.

	 * vbios does this for us in asic_init in that case.

	 */

	if (adev->virtualization.supports_sr_iov)

		return 0;



	hdr = (const struct smc_firmware_header_v1_0 *)adev->pm.fw->data;

	amdgpu_ucode_print_smc_hdr(&hdr->header);

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

+6 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ static int tonga_smu_upload_firmware_image(struct amdgpu_device *adev) 
	if (!adev->pm.fw)

		return -EINVAL;



	/* Skip SMC ucode loading on SR-IOV capable boards.

	 * vbios does this for us in asic_init in that case.

	 */

	if (adev->virtualization.supports_sr_iov)

		return 0;



	hdr = (const struct smc_firmware_header_v1_0 *)adev->pm.fw->data;

	amdgpu_ucode_print_smc_hdr(&hdr->header);