[PATCH 1/5] drm/amdgpu/psp: add a few more fw load type checks

[Christian König]

Am 09.03.2018 um 21:25 schrieb Alex Deucher:
> We already checked and returned early in most of the IP
> functions, fill in the rest as well.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

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

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 6e712f12eecd..9a75410cd576 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -62,6 +62,9 @@ static int psp_sw_init(void *handle)
>   
>   	psp->adev = adev;
>   
> +	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
> +		return 0;
> +
>   	ret = psp_init_microcode(psp);
>   	if (ret) {
>   		DRM_ERROR("Failed to load psp firmware!\n");
> @@ -75,6 +78,9 @@ static int psp_sw_fini(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   
> +	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
> +		return 0;
> +
>   	release_firmware(adev->psp.sos_fw);
>   	adev->psp.sos_fw = NULL;
>   	release_firmware(adev->psp.asd_fw);
> @@ -453,6 +459,9 @@ static int psp_suspend(void *handle)
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	struct psp_context *psp = &adev->psp;
>   
> +	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
> +		return 0;
> +
>   	ret = psp_ring_stop(psp, PSP_RING_TYPE__KM);
>   	if (ret) {
>   		DRM_ERROR("PSP ring stop failed\n");