Commit 186a1fb7 authored by Krunoslav Kovac's avatar Krunoslav Kovac Committed by Alex Deucher

drm/amd/display: Change HDR_MULT check

[Why]
Currently we require HDR_MULT >= 1.0
There are scenarios where we need < 1.0

[How]
Only guard against 0 - it will black-screen image.
It is up to higher-level logic to decide what HDR_MULT
values are allowed in each particular case.
Signed-off-by: default avatarKrunoslav Kovac <Krunoslav.Kovac@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9ec53e11
...@@ -2390,17 +2390,13 @@ void dcn10_set_hdr_multiplier(struct pipe_ctx *pipe_ctx) ...@@ -2390,17 +2390,13 @@ void dcn10_set_hdr_multiplier(struct pipe_ctx *pipe_ctx)
struct fixed31_32 multiplier = pipe_ctx->plane_state->hdr_mult; struct fixed31_32 multiplier = pipe_ctx->plane_state->hdr_mult;
uint32_t hw_mult = 0x1f000; // 1.0 default multiplier uint32_t hw_mult = 0x1f000; // 1.0 default multiplier
struct custom_float_format fmt; struct custom_float_format fmt;
bool mult_negative; // True if fixed31_32 sign bit indicates negative value
uint32_t mult_int; // int component of fixed31_32
fmt.exponenta_bits = 6; fmt.exponenta_bits = 6;
fmt.mantissa_bits = 12; fmt.mantissa_bits = 12;
fmt.sign = true; fmt.sign = true;
mult_negative = multiplier.value >> 63 != 0;
mult_int = multiplier.value >> 32;
if (mult_int && !mult_negative) // Check if greater than 1 if (!dc_fixpt_eq(multiplier, dc_fixpt_from_int(0))) // check != 0
convert_to_custom_float_format(multiplier, &fmt, &hw_mult); convert_to_custom_float_format(multiplier, &fmt, &hw_mult);
pipe_ctx->plane_res.dpp->funcs->dpp_set_hdr_multiplier( pipe_ctx->plane_res.dpp->funcs->dpp_set_hdr_multiplier(
......
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