[PATCH] drm/amdgpu: set firmware loading type as direct by default for raven

[PATCH] drm/amdgpu: set firmware loading type as direct by default for raven

[Huang Rui]

In previous case, driver can't enable psp via the kernel parameter for raven.
We should open this path and set it as direct by default till psp firmware
loading is workable.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 17a935d..fcfb9d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -275,14 +275,10 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
 		else
 			return AMDGPU_FW_LOAD_PSP;
 	case CHIP_RAVEN:
-#if 0
-		if (!load_type)
+		if (load_type != 2)
 			return AMDGPU_FW_LOAD_DIRECT;
 		else
 			return AMDGPU_FW_LOAD_PSP;
-#else
-		return AMDGPU_FW_LOAD_DIRECT;
-#endif
 	default:
 		DRM_ERROR("Unknow firmware load type\n");
 	}
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: set firmware loading type as direct by default for raven

[Zhang, Jerry (Junwei)]

Hi Ray,

Thanks for your initial patch to enable PSP option for Raven.

To simplify it, we may leverage VEGA10 case for Raven directly.
And remove all Raven existing code under "case CHIP_RAVEN"
How do you think about it?

Jerry

On 07/04/2017 04:35 PM, Huang Rui wrote:
> In previous case, driver can't enable psp via the kernel parameter for raven.
> We should open this path and set it as direct by default till psp firmware
> loading is workable.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index 17a935d..fcfb9d4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -275,14 +275,10 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
>   		else
>   			return AMDGPU_FW_LOAD_PSP;
>   	case CHIP_RAVEN:
> -#if 0
> -		if (!load_type)
> +		if (load_type != 2)
>   			return AMDGPU_FW_LOAD_DIRECT;
>   		else
>   			return AMDGPU_FW_LOAD_PSP;
> -#else
> -		return AMDGPU_FW_LOAD_DIRECT;
> -#endif
>   	default:
>   		DRM_ERROR("Unknow firmware load type\n");
>   	}
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: set firmware loading type as direct by default for raven

[Huang Rui]

On Tue, Jul 04, 2017 at 05:39:51PM +0800, Zhang, Jerry wrote:
> Hi Ray,
> 
> Thanks for your initial patch to enable PSP option for Raven.
> 
> To simplify it, we may leverage VEGA10 case for Raven directly.
> And remove all Raven existing code under "case CHIP_RAVEN"
> How do you think about it?
> 

Probably not. Vega10 enabled psp fw loading by default, but not for raven.

My mainly idea here is 

default:
modprobe amdgpu -> use direct fw loading.

debugging psp:
modprobe amdgpu fw_load_type=2 -> use psp fw loading.

It doesn't impact other guys use and we can debug it more smoothly. :-)

Thanks,
Ray
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: set firmware loading type as direct by default for raven

[Zhang, Jerry (Junwei)]

On 07/04/2017 05:59 PM, Huang Rui wrote:
> On Tue, Jul 04, 2017 at 05:39:51PM +0800, Zhang, Jerry wrote:
>> Hi Ray,
>>
>> Thanks for your initial patch to enable PSP option for Raven.
>>
>> To simplify it, we may leverage VEGA10 case for Raven directly.
>> And remove all Raven existing code under "case CHIP_RAVEN"
>> How do you think about it?
>>
>
> Probably not. Vega10 enabled psp fw loading by default, but not for raven.
>
> My mainly idea here is
>
> default:
> modprobe amdgpu -> use direct fw loading.
>
> debugging psp:
> modprobe amdgpu fw_load_type=2 -> use psp fw loading.
>
> It doesn't impact other guys use and we can debug it more smoothly. :-)

Thanks to explain it in detail.
Got it.

Feel free to add my RB and we can improve it when everything is settled down.
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>

>
> Thanks,
> Ray
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx