All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Huang, Ray" <Ray.Huang-5C7GfCeVMHo@public.gmane.org>
To: "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org"
	<amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Cc: "Liu, Aaron" <Aaron.Liu-5C7GfCeVMHo@public.gmane.org>
Subject: RE: [PATCH] drm/amdgpu: both support PCO FP5/AM4 rlc fw
Date: Thu, 6 Dec 2018 02:13:54 +0000	[thread overview]
Message-ID: <BY2PR12MB0040297DF6748FD2D4499BECECA90@BY2PR12MB0040.namprd12.prod.outlook.com> (raw)
In-Reply-To: <1544059612-3380-1-git-send-email-aaron.liu-5C7GfCeVMHo@public.gmane.org>

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Aaron Liu
> Sent: Thursday, December 06, 2018 9:27 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Liu, Aaron <Aaron.Liu@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@amd.com>

Reviewed-by: Huang Rui <ray.huang@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2018-12-06  2:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-06  1:26 [PATCH] drm/amdgpu: both support PCO FP5/AM4 rlc fw Aaron Liu
     [not found] ` <1544059612-3380-1-git-send-email-aaron.liu-5C7GfCeVMHo@public.gmane.org>
2018-12-06  2:13   ` Huang, Ray [this message]
2018-12-06  2:45   ` Deucher, Alexander

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BY2PR12MB0040297DF6748FD2D4499BECECA90@BY2PR12MB0040.namprd12.prod.outlook.com \
    --to=ray.huang-5c7gfcevmho@public.gmane.org \
    --cc=Aaron.Liu-5C7GfCeVMHo@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.