[PATCH] drm/amdgpu/gfx10: add support for wks firmware loading

[Alex Deucher]

On Wed, Sep 18, 2019 at 10:04 PM Tianci Yin <tianci.yin at amd.com> wrote:
>
> From: "Tianci.Yin" <tianci.yin at amd.com>
>
> load different cp firmware according to the DID and RID
>
> Signed-off-by: Tianci.Yin <tianci.yin at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 ++++++++++++++++++------
>  1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 082a0b3298a9..b5d3e75e7e88 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -66,6 +66,11 @@ MODULE_FIRMWARE("amdgpu/navi10_mec.bin");
>  MODULE_FIRMWARE("amdgpu/navi10_mec2.bin");
>  MODULE_FIRMWARE("amdgpu/navi10_rlc.bin");
>
> +MODULE_FIRMWARE("amdgpu/navi14_ce_wks.bin");
> +MODULE_FIRMWARE("amdgpu/navi14_pfp_wks.bin");
> +MODULE_FIRMWARE("amdgpu/navi14_me_wks.bin");
> +MODULE_FIRMWARE("amdgpu/navi14_mec_wks.bin");
> +MODULE_FIRMWARE("amdgpu/navi14_mec2_wks.bin");
>  MODULE_FIRMWARE("amdgpu/navi14_ce.bin");
>  MODULE_FIRMWARE("amdgpu/navi14_pfp.bin");
>  MODULE_FIRMWARE("amdgpu/navi14_me.bin");
> @@ -591,7 +596,8 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev)
>  static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
>  {
>         const char *chip_name;
> -       char fw_name[30];
> +       const char *wks;
> +       char fw_name[40];
>         int err;
>         struct amdgpu_firmware_info *info = NULL;
>         const struct common_firmware_header *header = NULL;
> @@ -618,7 +624,13 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
>                 BUG();
>         }
>
> -       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name);
> +       if(adev->pdev->device == 0x7340 &&
> +          adev->pdev->revision != 0x00)
> +               wks = "";
> +       else
> +               wks = "_wks";
> +
> +       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp%s.bin", chip_name, wks);
>         err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);
>         if (err)
>                 goto out;
> @@ -629,7 +641,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
>         adev->gfx.pfp_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
>         adev->gfx.pfp_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
>
> -       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name);
> +       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me%s.bin", chip_name, wks);
>         err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);
>         if (err)
>                 goto out;
> @@ -640,7 +652,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
>         adev->gfx.me_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
>         adev->gfx.me_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
>
> -       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name);
> +       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce%s.bin", chip_name, wks);
>         err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);
>         if (err)
>                 goto out;
> @@ -705,7 +717,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
>         if (adev->gfx.rlc.is_rlc_v2_1)
>                 gfx_v10_0_init_rlc_ext_microcode(adev);
>
> -       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
> +       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec%s.bin", chip_name, wks);
>         err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
>         if (err)
>                 goto out;
> @@ -716,7 +728,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
>         adev->gfx.mec_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
>         adev->gfx.mec_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
>
> -       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
> +       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2%s.bin", chip_name, wks);
>         err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
>         if (!err) {
>                 err = amdgpu_ucode_validate(adev->gfx.mec2_fw);
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx