From: Likun Gao Date: Tue, 24 Mar 2020 20:27:43 +0000 (-0400) Subject: drm/amdgpu: add psp block load condition for sienna_cichlid X-Git-Tag: v5.10.7~1861^2~25^2~354 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56304e72af66d9ad145ea90a2b82f8f317e825b9;p=platform%2Fkernel%2Flinux-rpi.git drm/amdgpu: add psp block load condition for sienna_cichlid Enable PSP block for firmware loading and other security setup only when amdgpu use PSP load type to load ucode. Signed-off-by: Likun Gao 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 a4a80ae..b4178ce 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -488,7 +488,8 @@ 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); - amdgpu_device_ip_block_add(adev, &psp_v11_0_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);