[PATCH 5/5] drm/amd/pp: Fix SMIO implementation on CI

[Alex Deucher]

On Tue, Jan 16, 2018 at 6:18 AM, Rex Zhu <Rex.Zhu at amd.com> wrote:
> Setup smio table(smio registers's address and voltage ID)
> for various voltage domain.
>
> Change-Id: I14be46053ffb2954c1533f4e67d3b0632107af7a
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>

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

> ---
>  drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 31 +++++++++++++++---------
>  1 file changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> index 03b5f10..98be127 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
> @@ -860,10 +860,13 @@ static int ci_populate_smc_vddc_table(struct pp_hwmgr *hwmgr,
>                 PP_ASSERT_WITH_CODE(0 == result, "do not populate SMC VDDC voltage table", return -EINVAL);
>
>                 /* GPIO voltage control */
> -               if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->voltage_control)
> -                       table->VddcLevel[count].Smio |= data->vddc_voltage_table.entries[count].smio_low;
> -               else
> +               if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->voltage_control) {
> +                       table->VddcLevel[count].Smio = (uint8_t) count;
> +                       table->Smio[count] |= data->vddc_voltage_table.entries[count].smio_low;
> +                       table->SmioMaskVddcVid |= data->vddc_voltage_table.entries[count].smio_low;
> +               } else {
>                         table->VddcLevel[count].Smio = 0;
> +               }
>         }
>
>         CONVERT_FROM_HOST_TO_SMC_UL(table->VddcLevelCount);
> @@ -885,10 +888,13 @@ static int ci_populate_smc_vdd_ci_table(struct pp_hwmgr *hwmgr,
>                                 &(data->vddci_voltage_table.entries[count]),
>                                 &(table->VddciLevel[count]));
>                 PP_ASSERT_WITH_CODE(result == 0, "do not populate SMC VDDCI voltage table", return -EINVAL);
> -               if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->vddci_control)
> -                       table->VddciLevel[count].Smio |= data->vddci_voltage_table.entries[count].smio_low;
> -               else
> -                       table->VddciLevel[count].Smio |= 0;
> +               if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->vddci_control) {
> +                       table->VddciLevel[count].Smio = (uint8_t) count;
> +                       table->Smio[count] |= data->vddci_voltage_table.entries[count].smio_low;
> +                       table->SmioMaskVddciVid |= data->vddci_voltage_table.entries[count].smio_low;
> +               } else {
> +                       table->VddciLevel[count].Smio = 0;
> +               }
>         }
>
>         CONVERT_FROM_HOST_TO_SMC_UL(table->VddciLevelCount);
> @@ -910,10 +916,13 @@ static int ci_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr,
>                                 &(data->mvdd_voltage_table.entries[count]),
>                                 &table->MvddLevel[count]);
>                 PP_ASSERT_WITH_CODE(result == 0, "do not populate SMC mvdd voltage table", return -EINVAL);
> -               if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->mvdd_control)
> -                       table->MvddLevel[count].Smio |= data->mvdd_voltage_table.entries[count].smio_low;
> -               else
> -                       table->MvddLevel[count].Smio |= 0;
> +               if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->mvdd_control) {
> +                       table->MvddLevel[count].Smio = (uint8_t) count;
> +                       table->Smio[count] |= data->mvdd_voltage_table.entries[count].smio_low;
> +                       table->SmioMaskMvddVid |= data->mvdd_voltage_table.entries[count].smio_low;
> +               } else {
> +                       table->MvddLevel[count].Smio = 0;
> +               }
>         }
>
>         CONVERT_FROM_HOST_TO_SMC_UL(table->MvddLevelCount);
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx