[PATCH 3/4] drm/amd/pp: get Rv smu_version and notify amdgpu

[Alex Deucher]

On Tue, Dec 19, 2017 at 3:11 AM, Rex Zhu <Rex.Zhu at amd.com> wrote:

Please include a patch description.  E.g.,
The smu firmware is loaded by the sbios on APUs, so query it from the
smu and update the
smu fw version info that is reported to userspace.

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

Can you update CZ/ST as well if you get a chance?

Thanks,

Alex


> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c          | 3 +++
>  drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 8 ++++++++
>  2 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
> index 85d2149..13607e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
> @@ -801,6 +801,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
>                                 else
>                                         strcpy(fw_name, "amdgpu/vega10_smc.bin");
>                                 break;
> +                       case CHIP_RAVEN:
> +                               adev->pm.fw_version = info->version;
> +                               return 0;
>                         default:
>                                 DRM_ERROR("SMC firmware not supported\n");
>                                 return -EINVAL;
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
> index b98ade6..2d662b4 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
> @@ -305,6 +305,14 @@ static int rv_smu_fini(struct pp_hwmgr *hwmgr)
>
>  static int rv_start_smu(struct pp_hwmgr *hwmgr)
>  {
> +       struct cgs_firmware_info info = {0};
> +
> +       smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetSmuVersion);
> +       rv_read_arg_from_smc(hwmgr, &hwmgr->smu_version);
> +       info.version = hwmgr->smu_version >> 8;
> +
> +       cgs_get_firmware_info(hwmgr->device, CGS_UCODE_ID_SMU, &info);
> +
>         if (rv_verify_smc_interface(hwmgr))
>                 return -EINVAL;
>         if (rv_smc_enable_sdma(hwmgr))
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx