[PATCH 2/4] drm/amd/pp: update smu_version value for CI/VI

[Alex Deucher]

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

Missing your signed-off-by.  Please also include a patch description.  E.g.,
Set the new common smu firmware version for smu7 parts (CI and VI).

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

> ---
>  drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c      | 1 +
>  drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 +-
>  drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c    | 2 +-
>  3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> index c6c741a..0b4a556 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> @@ -2316,6 +2316,7 @@ static int ci_load_smc_ucode(struct pp_hwmgr *hwmgr)
>         cgs_get_firmware_info(hwmgr->device, CGS_UCODE_ID_SMU, &info);
>
>         hwmgr->is_kicker = info.is_kicker;
> +       hwmgr->smu_version = info.version;
>         byte_count = info.image_size;
>         src = (uint8_t *)info.kptr;
>         start_addr = info.ucode_start_address;
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> index d75bb99..1253126 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
> @@ -204,7 +204,7 @@ static int iceland_smu_upload_firmware_image(struct pp_hwmgr *hwmgr)
>                 pr_err("[ powerplay ] SMC address is beyond the SMC RAM area\n");
>                 return -EINVAL;
>         }
> -
> +       hwmgr->smu_version = info.version;
>         /* wait for smc boot up */
>         PHM_WAIT_INDIRECT_FIELD_UNEQUAL(hwmgr, SMC_IND,
>                                          RCU_UC_EVENTS, boot_seq_done, 0);
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
> index 7f5359a..cb95e88 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
> @@ -535,7 +535,7 @@ int smu7_upload_smu_firmware_image(struct pp_hwmgr *hwmgr)
>                         smu7_convert_fw_type_to_cgs(UCODE_ID_SMU_SK), &info);
>
>         hwmgr->is_kicker = info.is_kicker;
> -
> +       hwmgr->smu_version = info.version;
>         result = smu7_upload_smc_firmware_data(hwmgr, info.image_size, (uint32_t *)info.kptr, SMU7_SMC_SIZE);
>
>         return result;
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx