[PATCH 10/10] amdgpu/dc: inline dml_round_to_multiple

[Harry Wentland]

On 2017-09-29 03:13 AM, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> turns out to be a win to inline this.
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>

Series is
Reviewed-by: Harry Wentland <harry.wentland at amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c | 19 -------------------
>  drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h |  2 --
>  drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 19 +++++++++++++++++++
>  3 files changed, 19 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
> index 7c0eb52..df2d509 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
> @@ -39,23 +39,4 @@ double dml_round(double a)
>  		return floor;
>  }
>  
> -unsigned int dml_round_to_multiple(
> -	unsigned int num,
> -	unsigned int multiple,
> -	bool up)
> -{
> -	unsigned int remainder;
> -
> -	if (multiple == 0)
> -		return num;
> -
> -	remainder = num % multiple;
>  
> -	if (remainder == 0)
> -		return num;
> -
> -	if (up)
> -		return (num + multiple - remainder);
> -	else
> -		return (num - remainder);
> -}
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h
> index a2da3da..81c53d8 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h
> @@ -33,7 +33,5 @@
>  #define DTRACE(str, ...) dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__);
>  
>  double dml_round(double a);
> -unsigned int dml_round_to_multiple(
> -			unsigned int num, unsigned int multiple, bool up);
>  
>  #endif /* __DC_COMMON_DEFS_H__ */
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
> index 1c6c631..a91b4a6 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
> @@ -58,4 +58,23 @@ static inline double dml_log(double x, double base)
>  	return (double) dcn_bw_log(x, base);
>  }
>  
> +static inline unsigned int dml_round_to_multiple(unsigned int num,
> +						 unsigned int multiple,
> +						 bool up)
> +{
> +	unsigned int remainder;
> +
> +	if (multiple == 0)
> +		return num;
> +
> +	remainder = num % multiple;
> +
> +	if (remainder == 0)
> +		return num;
> +
> +	if (up)
> +		return (num + multiple - remainder);
> +	else
> +		return (num - remainder);
> +}
>  #endif
>