From: Jiansong Chen Date: Wed, 8 Jul 2020 21:07:26 +0000 (-0400) Subject: drm/amdgpu: add psp block for navy_flounder X-Git-Tag: v5.9-rc1~51^2~17^2~21 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7420eab23b5cc6ee3c5c57679990f848e2f51ede;p=tomoyo%2Ftomoyo-test1.git drm/amdgpu: add psp block for navy_flounder Add psp and smu block for navy_flounder with psp firmware load type. Signed-off-by: Jiansong Chen Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index e74978ffbaae..7f2954aeac3e 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -527,6 +527,11 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) amdgpu_device_ip_block_add(adev, &nv_common_ip_block); amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block); amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block); + 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)) + 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); amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);