Commit afbc95cd authored by Kumar, Mahesh's avatar Kumar, Mahesh Committed by Matt Roper

drm/i915: fix naming of fixed_16_16 wrapper.

fixed_16_16_div_round_up(_u64), wrapper for fixed_16_16 division
operation don't really round_up the result. Wrapper round_up only the
fraction part of the result to make it 16-bit.
This patch eliminates round_up keyword from the wrapper.

Later patch will introduce the new wrapper to do rounding-off the result
and give unt32_t output to cleanup mix use of fixed_16_16_t & uint32_t
variables.
Signed-off-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517115831.13830-2-mahesh1.kumar@intel.com
parent 955a4b89
...@@ -153,8 +153,7 @@ static inline uint_fixed_16_16_t max_fixed_16_16(uint_fixed_16_16_t max1, ...@@ -153,8 +153,7 @@ 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 fixed_16_16_div_round_up(uint32_t val, static inline uint_fixed_16_16_t fixed_16_16_div(uint32_t val, uint32_t d)
uint32_t d)
{ {
uint_fixed_16_16_t fp, res; uint_fixed_16_16_t fp, res;
...@@ -163,8 +162,7 @@ static inline uint_fixed_16_16_t fixed_16_16_div_round_up(uint32_t val, ...@@ -163,8 +162,7 @@ static inline uint_fixed_16_16_t fixed_16_16_div_round_up(uint32_t val,
return res; return res;
} }
static inline uint_fixed_16_16_t fixed_16_16_div_round_up_u64(uint32_t val, static inline uint_fixed_16_16_t fixed_16_16_div_u64(uint32_t val, uint32_t d)
uint32_t d)
{ {
uint_fixed_16_16_t res; uint_fixed_16_16_t res;
uint64_t interm_val; uint64_t interm_val;
......
...@@ -4165,7 +4165,7 @@ static uint_fixed_16_16_t skl_wm_method1(uint32_t pixel_rate, uint8_t cpp, ...@@ -4165,7 +4165,7 @@ static uint_fixed_16_16_t skl_wm_method1(uint32_t pixel_rate, uint8_t cpp,
return FP_16_16_MAX; return FP_16_16_MAX;
wm_intermediate_val = latency * pixel_rate * cpp; wm_intermediate_val = latency * pixel_rate * cpp;
ret = fixed_16_16_div_round_up_u64(wm_intermediate_val, 1000 * 512); ret = fixed_16_16_div_u64(wm_intermediate_val, 1000 * 512);
return ret; return ret;
} }
...@@ -4301,8 +4301,8 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, ...@@ -4301,8 +4301,8 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
if (y_tiled) { if (y_tiled) {
interm_pbpl = DIV_ROUND_UP(plane_bytes_per_line * interm_pbpl = DIV_ROUND_UP(plane_bytes_per_line *
y_min_scanlines, 512); y_min_scanlines, 512);
plane_blocks_per_line = plane_blocks_per_line = fixed_16_16_div(interm_pbpl,
fixed_16_16_div_round_up(interm_pbpl, y_min_scanlines); y_min_scanlines);
} else if (x_tiled) { } else if (x_tiled) {
interm_pbpl = DIV_ROUND_UP(plane_bytes_per_line, 512); interm_pbpl = DIV_ROUND_UP(plane_bytes_per_line, 512);
plane_blocks_per_line = u32_to_fixed_16_16(interm_pbpl); plane_blocks_per_line = u32_to_fixed_16_16(interm_pbpl);
......
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