Revert "amdgpu/dc: inline dml_round_to_multiple"
This reverts commit d8c893b44b
.
Unfortunately these clash with our DML update from the HW guys.
Will attempt to reroll them after.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
c73b046f86
commit
07e9266593
|
@ -39,4 +39,23 @@ double dml_round(double a)
|
||||||
return floor;
|
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);
|
||||||
|
}
|
||||||
|
|
|
@ -33,5 +33,7 @@
|
||||||
#define DTRACE(str, ...) dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__);
|
#define DTRACE(str, ...) dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__);
|
||||||
|
|
||||||
double dml_round(double a);
|
double dml_round(double a);
|
||||||
|
unsigned int dml_round_to_multiple(
|
||||||
|
unsigned int num, unsigned int multiple, bool up);
|
||||||
|
|
||||||
#endif /* __DC_COMMON_DEFS_H__ */
|
#endif /* __DC_COMMON_DEFS_H__ */
|
||||||
|
|
|
@ -58,23 +58,4 @@ static inline double dml_log(double x, double base)
|
||||||
return (double) dcn_bw_log(x, 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
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue