Commit 19b7fe4a authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher

Revert "amdgpu/dc: inline a bunch of float operations."

This reverts commit d1209512.

Unfortunately these clash with our DML update from the HW guys.

Rerolling this after the fact won't save us anything anymore,
unfortunately so we're back to non-inline for this.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 378c4a2d
...@@ -25,6 +25,25 @@ ...@@ -25,6 +25,25 @@
#include "dcn_calc_math.h" #include "dcn_calc_math.h"
float dcn_bw_mod(const float arg1, const float arg2)
{
return arg1 - arg1 * ((int) (arg1 / arg2));
}
float dcn_bw_min2(const float arg1, const float arg2)
{
return arg1 < arg2 ? arg1 : arg2;
}
unsigned int dcn_bw_max(const unsigned int arg1, const unsigned int arg2)
{
return arg1 > arg2 ? arg1 : arg2;
}
float dcn_bw_max2(const float arg1, const float arg2)
{
return arg1 > arg2 ? arg1 : arg2;
}
float dcn_bw_floor2(const float arg, const float significance) float dcn_bw_floor2(const float arg, const float significance)
{ {
if (significance == 0) if (significance == 0)
...@@ -40,6 +59,16 @@ float dcn_bw_ceil2(const float arg, const float significance) ...@@ -40,6 +59,16 @@ float dcn_bw_ceil2(const float arg, const float significance)
return flr + 0.00001 >= arg ? arg : flr + significance; return flr + 0.00001 >= arg ? arg : flr + significance;
} }
float dcn_bw_max3(float v1, float v2, float v3)
{
return v3 > dcn_bw_max2(v1, v2) ? v3 : dcn_bw_max2(v1, v2);
}
float dcn_bw_max5(float v1, float v2, float v3, float v4, float v5)
{
return dcn_bw_max3(v1, v2, v3) > dcn_bw_max2(v4, v5) ? dcn_bw_max3(v1, v2, v3) : dcn_bw_max2(v4, v5);
}
float dcn_bw_pow(float a, float exp) float dcn_bw_pow(float a, float exp)
{ {
float temp; float temp;
......
...@@ -26,38 +26,14 @@ ...@@ -26,38 +26,14 @@
#ifndef _DCN_CALC_MATH_H_ #ifndef _DCN_CALC_MATH_H_
#define _DCN_CALC_MATH_H_ #define _DCN_CALC_MATH_H_
static inline float dcn_bw_mod(const float arg1, const float arg2) float dcn_bw_mod(const float arg1, const float arg2);
{ float dcn_bw_min2(const float arg1, const float arg2);
return arg1 - arg1 * ((int) (arg1 / arg2)); unsigned int dcn_bw_max(const unsigned int arg1, const unsigned int arg2);
} float dcn_bw_max2(const float arg1, const float arg2);
static inline float dcn_bw_min2(const float arg1, const float arg2)
{
return arg1 < arg2 ? arg1 : arg2;
}
static inline unsigned int dcn_bw_max(const unsigned int arg1, const unsigned int arg2)
{
return arg1 > arg2 ? arg1 : arg2;
}
static inline float dcn_bw_max2(const float arg1, const float arg2)
{
return arg1 > arg2 ? arg1 : arg2;
}
static inline float dcn_bw_max3(float v1, float v2, float v3)
{
return v3 > dcn_bw_max2(v1, v2) ? v3 : dcn_bw_max2(v1, v2);
}
static inline float dcn_bw_max5(float v1, float v2, float v3, float v4, float v5)
{
return dcn_bw_max3(v1, v2, v3) > dcn_bw_max2(v4, v5) ? dcn_bw_max3(v1, v2, v3) : dcn_bw_max2(v4, v5);
}
float dcn_bw_floor2(const float arg, const float significance); float dcn_bw_floor2(const float arg, const float significance);
float dcn_bw_ceil2(const float arg, const float significance); float dcn_bw_ceil2(const float arg, const float significance);
float dcn_bw_max3(float v1, float v2, float v3);
float dcn_bw_max5(float v1, float v2, float v3, float v4, float v5);
float dcn_bw_pow(float a, float exp); float dcn_bw_pow(float a, float exp);
float dcn_bw_log(float a, float b); float dcn_bw_log(float a, float b);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment