Commit 8973d9ec authored Dec 16, 2019 by Emily Deng Committed by Alex Deucher Dec 18, 2019

drm/amdgpu/sriov: Tonga sriov also need load firmware with smu



Fix Tonga sriov load driver fail issue.

Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewd-by Yintian Tao <Yintian.tao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 61934624

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1810,6 +1810,7 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)
		}
		}

		if (!amdgpu_sriov_vf(adev) \|\| adev->asic_type == CHIP_TONGA)
		r = amdgpu_pm_load_smu_firmware(adev, &smu_version);

		return r;

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -278,9 +278,6 @@ static int pp_dpm_load_fw(void *handle)
		if (!hwmgr \|\| !hwmgr->smumgr_funcs \|\| !hwmgr->smumgr_funcs->start_smu)
		return -EINVAL;

		if (!hwmgr->not_vf)
		return 0;

		if (hwmgr->smumgr_funcs->start_smu(hwmgr)) {
		pr_err("fw load failed\n");
		return -EINVAL;