[PATCH 4/4] drm/amdgpu: enable raven to load firmwares by psp at default

[ray.huang@xxxxxxx (Huang Rui)]

On Mon, Sep 11, 2017 at 09:22:05AM +0800, Evan Quan wrote:
> Change-Id: I7a0427555b34111e4e7600aa1e8b9cae31b44af7
> Signed-off-by: Evan Quan <evan.quan at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c   | 2 --
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 +-
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 1157eb4..8a1ee97 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -64,9 +64,7 @@ static int psp_sw_init(void *handle)
>  		psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;
>  		break;
>  	case CHIP_RAVEN:
> -#if 0
>  		psp->init_microcode = psp_v10_0_init_microcode;
> -#endif
>  		psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf;
>  		psp->ring_init = psp_v10_0_ring_init;
>  		psp->ring_create = psp_v10_0_ring_create;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index 36c7633..4073e08 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -275,7 +275,7 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
>  		else
>  			return AMDGPU_FW_LOAD_PSP;
>  	case CHIP_RAVEN:
> -		if (load_type != 2)
> +		if (!load_type)
>  			return AMDGPU_FW_LOAD_DIRECT;
>  		else
>  			return AMDGPU_FW_LOAD_PSP;

        case CHIP_VEGA10:
        case CHIP_RAVEN:
                if (!load_type)
                        return AMDGPU_FW_LOAD_DIRECT;
                else
                        return AMDGPU_FW_LOAD_PSP;

We can re-use "VEGA10 case" here.

Thanks,
Rui