diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-01-27 17:11:29 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-01-27 17:15:06 +0300 |
| commit | 40f62bb75e354dddfd8d7b6d7b96c4ab93cb00f1 (patch) | |
| tree | 8a8aee04553f2a796629cbc1a243470b6279e76d /include | |
| parent | 05c41f926fcc7ef838c80a6a99d84f67b4e0b824 (diff) | |
| download | linux-40f62bb75e354dddfd8d7b6d7b96c4ab93cb00f1.tar.xz | |
Revert "drm/color: un-inline drm_color_lut_extract()"
This reverts commit 2eebe4f2d5f4c91edc37801d828ba29edfbc7722, because I
screwed up and applied it to the wrong branch.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_color_mgmt.h | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h index bce4a532836d..c767238ac9d5 100644 --- a/include/drm/drm_color_mgmt.h +++ b/include/drm/drm_color_mgmt.h @@ -25,8 +25,6 @@ #include <linux/ctype.h> -uint32_t drm_color_lut_extract(uint32_t user_input, uint32_t bit_precision); - void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, uint degamma_lut_size, bool has_ctm, @@ -35,4 +33,29 @@ void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, int gamma_size); +/** + * drm_color_lut_extract - clamp&round LUT entries + * @user_input: input value + * @bit_precision: number of bits the hw LUT supports + * + * Extract a degamma/gamma LUT value provided by user (in the form of + * &drm_color_lut entries) and round it to the precision supported by the + * hardware. + */ +static inline uint32_t drm_color_lut_extract(uint32_t user_input, + uint32_t bit_precision) +{ + uint32_t val = user_input; + uint32_t max = 0xffff >> (16 - bit_precision); + + /* Round only if we're not using full precision. */ + if (bit_precision < 16) { + val += 1UL << (16 - bit_precision - 1); + val >>= 16 - bit_precision; + } + + return clamp_val(val, 0, max); +} + + #endif |