[PATCH] drm/amd/display: Reapply 2fde4fdddc1f

[Alex Deucher]

Applied.  Thanks!

On Wed, Jul 24, 2024 at 11:50 AM Nathan Chancellor <nathan at kernel.org> wrote:
>
> Commit 2563391e57b5 ("drm/amd/display: DML2.1 resynchronization") blew
> away the compiler warning fix from commit 2fde4fdddc1f
> ("drm/amd/display: Avoid -Wenum-float-conversion in
> add_margin_and_round_to_dfs_grainularity()"), causing the warning to
> reappear.
>
>   drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:183:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion]
>     183 |         divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
>         |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~
>   1 error generated.
>
> Apply the fix again to resolve the warning.
>
> Fixes: 2563391e57b5 ("drm/amd/display: DML2.1 resynchronization")
> Signed-off-by: Nathan Chancellor <nathan at kernel.org>
> ---
>  .../gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c    | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c
> index 0021bbaa4b91..f19f6ebaae13 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c
> @@ -180,7 +180,7 @@ static bool add_margin_and_round_to_dfs_grainularity(double clock_khz, double ma
>
>         clock_khz *= 1.0 + margin;
>
> -       divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
> +       divider = (unsigned int)((int)DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
>
>         /* we want to floor here to get higher clock than required rather than lower */
>         if (divider < DFS_DIVIDER_RANGE_2_START) {
>
> ---
> base-commit: bd4bea5ab2bda37ddb092a978218c4d9b46927e6
> change-id: 20240724-amdgpu-dml2-fix-float-enum-warning-again-647a33789138
>
> Best regards,
> --
> Nathan Chancellor <nathan at kernel.org>
>