From: Tao Zhou Date: Thu, 4 Jun 2020 07:20:39 +0000 (+0800) Subject: drm/amdgpu: add psp and smu block for dimgrey_cavefish X-Git-Tag: accepted/tizen/unified/20230118.172025~8358^2~12^2~295 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aff39cdecd225c2a1632785ede61efaedb6c0535;p=platform%2Fkernel%2Flinux-rpi.git drm/amdgpu: add psp and smu block for dimgrey_cavefish Add psp and smu block for dimgrey_cavefish with psp firmware load type. Signed-off-by: Tao Zhou Reviewed-by:Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index 9e567a3..b8b9ac7 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -630,6 +630,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);