[PATCH] drm/amd/pp: Fix truncated clock value when set watermark

[Alex Deucher]

On Mon, Nov 12, 2018 at 10:34 PM Rex Zhu <Rex.Zhu at amd.com> wrote:
>
> the clk value should be tranferred to MHz first and
> then transfer to uint16. otherwise, the clock value
> will be truncated.
>
> Reported-by: Hersen Wu <hersenxs.wu at amd.com>
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>

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

> ---
>  drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 32 ++++++++++++------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
> index 99a33c3..101c09b 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c
> @@ -713,20 +713,20 @@ int smu_set_watermarks_for_clocks_ranges(void *wt_table,
>         for (i = 0; i < wm_with_clock_ranges->num_wm_dmif_sets; i++) {
>                 table->WatermarkRow[1][i].MinClock =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_dcfclk_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_dcfclk_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[1][i].MaxClock =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_dcfclk_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_dcfclk_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[1][i].MinUclk =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_mem_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_min_mem_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[1][i].MaxUclk =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_mem_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_max_mem_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[1][i].WmSetting = (uint8_t)
>                                 wm_with_clock_ranges->wm_dmif_clocks_ranges[i].wm_set_id;
>         }
> @@ -734,20 +734,20 @@ int smu_set_watermarks_for_clocks_ranges(void *wt_table,
>         for (i = 0; i < wm_with_clock_ranges->num_wm_mcif_sets; i++) {
>                 table->WatermarkRow[0][i].MinClock =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_socclk_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_socclk_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[0][i].MaxClock =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_socclk_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_socclk_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[0][i].MinUclk =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_mem_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_min_mem_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[0][i].MaxUclk =
>                         cpu_to_le16((uint16_t)
> -                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_mem_clk_in_khz) /
> -                       1000);
> +                       (wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_max_mem_clk_in_khz /
> +                       1000));
>                 table->WatermarkRow[0][i].WmSetting = (uint8_t)
>                                 wm_with_clock_ranges->wm_mcif_clocks_ranges[i].wm_set_id;
>         }
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx