[PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check (v4)

[StDenis, Tom]

Thanks.  I like v4 better because it prints a message if the initial load op fails.  I'll push that.


Tom


________________________________
From: Deucher, Alexander
Sent: Friday, August 26, 2016 11:15
To: 'Tom St Denis'; amd-gfx at lists.freedesktop.org
Cc: StDenis, Tom
Subject: RE: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check (v4)

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Tom St Denis
> Sent: Friday, August 26, 2016 11:13 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: StDenis, Tom
> Subject: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check (v4)
>
> Remove an errant return in the middle of the check
> function as well as check for success in the start
> function.
>
> (v2) Add return check to smu_load_fw()
> (v3) Don't return early if SMU load check fails
> (v4) No returns!  :-)
>
> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>

Both v1 and v4 are:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

:)

> ---
>  drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
> b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
> index 87c023e518ab..e6464e21f9b2 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
> @@ -195,9 +195,6 @@ static int cz_check_fw_load_finish(struct pp_smumgr
> *smumgr,
>        if (smumgr == NULL || smumgr->device == NULL)
>                return -EINVAL;
>
> -     return cgs_read_register(smumgr->device,
> -                                     mmSMU_MP1_SRBM2P_ARG_0);
> -
>        cgs_write_register(smumgr->device, mmMP0PUB_IND_INDEX,
> index);
>
>        for (i = 0; i < smumgr->usec_timeout; i++) {
> @@ -275,7 +272,10 @@ static int cz_start_smu(struct pp_smumgr *smumgr)
>        if (smumgr->chip_id == CHIP_STONEY)
>                fw_to_check &= ~(UCODE_ID_SDMA1_MASK |
> UCODE_ID_CP_MEC_JT2_MASK);
>
> -     cz_request_smu_load_fw(smumgr);
> +     ret = cz_request_smu_load_fw(smumgr);
> +     if (ret)
> +             printk(KERN_ERR "[ powerplay] SMU firmware load
> failed\n");
> +
>        cz_check_fw_load_finish(smumgr, fw_to_check);
>
>        ret = cz_load_mec_firmware(smumgr);
> --
> 2.9.3
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20160826/1c4b9ca1/attachment.html>