[PATCH 1/6] drm/amdgpu:add PSP block only load_type=PSP

[Christian König]

Am 05.04.2017 um 11:11 schrieb Monk Liu:
> SRIOV currently only can load ucode directly, and PSP
> block is not supported by VF temporarily.
>
> will remove this restrict and use PSP load all ucode
> even for SRIOV later
>
> Change-Id: I6df5c4088c7c72d01928d5af8bfe5520447619ba
> Signed-off-by: Monk Liu <Monk.Liu at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com> for the whole 
series.

> ---
>   drivers/gpu/drm/amd/amdgpu/soc15.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 06afbcc..2955c0c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -497,7 +497,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>   		amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block);
>   		amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block);
>   		amdgpu_ip_block_add(adev, &vega10_ih_ip_block);
> -		amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
> +		if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)
> +			amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
>   		if (!amdgpu_sriov_vf(adev))
>   			amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
>   		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))