Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e92665 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

Revert "amdgpu/dc: inline dml_round_to_multiple" 



This reverts commit d8c893b4.

Unfortunately these clash with our DML update from the HW guys.
Will attempt to reroll them after.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c73b046f

drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c

+19 −0
Original line number Diff line number Diff line
@@ -39,4 +39,23 @@ 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);

}

drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h

+2 −0
Original line number Diff line number Diff line
@@ -33,5 +33,7 @@ 
#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__ */

drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h

+0 −19
Original line number Diff line number Diff line
@@ -58,23 +58,4 @@ 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