[PATCH] drm/amdgpu: both support PCO FP5/AM4 rlc fw

[Huang, Ray]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Aaron Liu
> Sent: Thursday, December 06, 2018 9:27 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Liu, Aaron <Aaron.Liu at amd.com>
> Subject: [PATCH] drm/amdgpu: both support PCO FP5/AM4 rlc fw
> 
> For Picasso && AM4 SOCKET board, we use picasso_rlc_am4.bin For Picasso
> && FP5 SOCKET board, we use picasso_rlc.bin
> 
> Judgment method:
> PCO AM4: revision >= 0xC8 && revision <= 0xCF
>          or revision >= 0xD8 && revision <= 0xDF otherwise is PCO FP5
> 
> Change-Id: I359f0a3d1bc7d4d49c871cb3fb82797c7b91b259
> Signed-off-by: Aaron Liu <aaron.liu at amd.com>

Reviewed-by: Huang Rui <ray.huang at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 94740ea..7556716 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -86,6 +86,7 @@ MODULE_FIRMWARE("amdgpu/picasso_me.bin");
>  MODULE_FIRMWARE("amdgpu/picasso_mec.bin");
>  MODULE_FIRMWARE("amdgpu/picasso_mec2.bin");
>  MODULE_FIRMWARE("amdgpu/picasso_rlc.bin");
> +MODULE_FIRMWARE("amdgpu/picasso_rlc_am4.bin");
> 
>  MODULE_FIRMWARE("amdgpu/raven2_ce.bin");
>  MODULE_FIRMWARE("amdgpu/raven2_pfp.bin");
> @@ -645,7 +646,20 @@ static int gfx_v9_0_init_microcode(struct
> amdgpu_device *adev)
>  	adev->gfx.ce_fw_version = le32_to_cpu(cp_hdr-
> >header.ucode_version);
>  	adev->gfx.ce_feature_version = le32_to_cpu(cp_hdr-
> >ucode_feature_version);
> 
> -	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin",
> chip_name);
> +	/*
> +	 * For Picasso && AM4 SOCKET board, we use picasso_rlc_am4.bin
> +	 * instead of picasso_rlc.bin.
> +	 * Judgment method:
> +	 * PCO AM4: revision >= 0xC8 && revision <= 0xCF
> +	 *          or revision >= 0xD8 && revision <= 0xDF
> +	 * otherwise is PCO FP5
> +	 */
> +	if (!strcmp(chip_name, "picasso") &&
> +		(((adev->pdev->revision >= 0xC8) && (adev->pdev->revision
> <= 0xCF)) ||
> +		((adev->pdev->revision >= 0xD8) && (adev->pdev->revision
> <= 0xDF))))
> +		snprintf(fw_name, sizeof(fw_name),
> "amdgpu/%s_rlc_am4.bin", chip_name);
> +	else
> +		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin",
> chip_name);
>  	err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
>  	if (err)
>  		goto out;
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx