drm/amdgpu: Sienna_Cichlid don't enable SMU for SRIOV
authorshaoyunl <shaoyun.liu@amd.com>
Tue, 17 Mar 2020 15:41:34 +0000 (11:41 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 1 Jul 2020 05:59:11 +0000 (01:59 -0400)
SMU firmware already been loaded from host, don't enable it for now.
May need to re-work it if we want to enable the SMU for guest in the future.

Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/nv.c

index 89c3727b7a8e08edef5d2779bef3196e58eed733..f4d4d91ebee275589b33f6ddbd176020b0fa55e4 100644 (file)
@@ -493,7 +493,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
                if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
                        amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
                if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP &&
-                   is_support_sw_smu(adev))
+                   is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev))
                        amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
                if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
                        amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);