Commit 07ab976d authored by Kumar, Mahesh's avatar Kumar, Mahesh Committed by Maarten Lankhorst

drm/i915: take-out common clamping code of fixed16 wrappers

This patch creates a new function for clamping u64 to fixed16.
And make use of this function in other fixed16 wrappers.
Signed-off-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170705143154.32132-2-mahesh1.kumar@intel.com
parent 61f3e770
...@@ -160,6 +160,14 @@ static inline uint_fixed_16_16_t max_fixed_16_16(uint_fixed_16_16_t max1, ...@@ -160,6 +160,14 @@ static inline uint_fixed_16_16_t max_fixed_16_16(uint_fixed_16_16_t max1,
return max; return max;
} }
static inline uint_fixed_16_16_t clamp_u64_to_fixed16(uint64_t val)
{
uint_fixed_16_16_t fp;
WARN_ON(val >> 32);
fp.val = clamp_t(uint32_t, val, 0, ~0);
return fp;
}
static inline uint32_t div_round_up_fixed16(uint_fixed_16_16_t val, static inline uint32_t div_round_up_fixed16(uint_fixed_16_16_t val,
uint_fixed_16_16_t d) uint_fixed_16_16_t d)
{ {
...@@ -170,26 +178,21 @@ static inline uint32_t mul_round_up_u32_fixed16(uint32_t val, ...@@ -170,26 +178,21 @@ static inline uint32_t mul_round_up_u32_fixed16(uint32_t val,
uint_fixed_16_16_t mul) uint_fixed_16_16_t mul)
{ {
uint64_t intermediate_val; uint64_t intermediate_val;
uint32_t result;
intermediate_val = (uint64_t) val * mul.val; intermediate_val = (uint64_t) val * mul.val;
intermediate_val = DIV_ROUND_UP_ULL(intermediate_val, 1 << 16); intermediate_val = DIV_ROUND_UP_ULL(intermediate_val, 1 << 16);
WARN_ON(intermediate_val >> 32); WARN_ON(intermediate_val >> 32);
result = clamp_t(uint32_t, intermediate_val, 0, ~0); return clamp_t(uint32_t, intermediate_val, 0, ~0);
return result;
} }
static inline uint_fixed_16_16_t mul_fixed16(uint_fixed_16_16_t val, static inline uint_fixed_16_16_t mul_fixed16(uint_fixed_16_16_t val,
uint_fixed_16_16_t mul) uint_fixed_16_16_t mul)
{ {
uint64_t intermediate_val; uint64_t intermediate_val;
uint_fixed_16_16_t fp;
intermediate_val = (uint64_t) val.val * mul.val; intermediate_val = (uint64_t) val.val * mul.val;
intermediate_val = intermediate_val >> 16; intermediate_val = intermediate_val >> 16;
WARN_ON(intermediate_val >> 32); return clamp_u64_to_fixed16(intermediate_val);
fp.val = clamp_t(uint32_t, intermediate_val, 0, ~0);
return fp;
} }
static inline uint_fixed_16_16_t fixed_16_16_div(uint32_t val, uint32_t d) static inline uint_fixed_16_16_t fixed_16_16_div(uint32_t val, uint32_t d)
...@@ -203,15 +206,11 @@ static inline uint_fixed_16_16_t fixed_16_16_div(uint32_t val, uint32_t d) ...@@ -203,15 +206,11 @@ static inline uint_fixed_16_16_t fixed_16_16_div(uint32_t val, uint32_t d)
static inline uint_fixed_16_16_t fixed_16_16_div_u64(uint32_t val, uint32_t d) static inline uint_fixed_16_16_t fixed_16_16_div_u64(uint32_t val, uint32_t d)
{ {
uint_fixed_16_16_t res;
uint64_t interm_val; uint64_t interm_val;
interm_val = (uint64_t)val << 16; interm_val = (uint64_t)val << 16;
interm_val = DIV_ROUND_UP_ULL(interm_val, d); interm_val = DIV_ROUND_UP_ULL(interm_val, d);
WARN_ON(interm_val >> 32); return clamp_u64_to_fixed16(interm_val);
res.val = (uint32_t) interm_val;
return res;
} }
static inline uint32_t div_round_up_u32_fixed16(uint32_t val, static inline uint32_t div_round_up_u32_fixed16(uint32_t val,
...@@ -229,12 +228,9 @@ static inline uint_fixed_16_16_t mul_u32_fixed_16_16(uint32_t val, ...@@ -229,12 +228,9 @@ static inline uint_fixed_16_16_t mul_u32_fixed_16_16(uint32_t val,
uint_fixed_16_16_t mul) uint_fixed_16_16_t mul)
{ {
uint64_t intermediate_val; uint64_t intermediate_val;
uint_fixed_16_16_t fp;
intermediate_val = (uint64_t) val * mul.val; intermediate_val = (uint64_t) val * mul.val;
WARN_ON(intermediate_val >> 32); return clamp_u64_to_fixed16(intermediate_val);
fp.val = (uint32_t) intermediate_val;
return fp;
} }
static inline const char *yesno(bool v) static inline const char *yesno(bool v)
......
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