]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amd/display: Change HDR_MULT check
authorKrunoslav Kovac <Krunoslav.Kovac@amd.com>
Fri, 15 Nov 2019 15:00:46 +0000 (10:00 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 5 Dec 2019 21:32:39 +0000 (16:32 -0500)
[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: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

index 61d2f1233f8ceba4135ab7165c35b2a3cffc8750..3996fef56948ade484bc8a3019b99766444bb6ca 100644 (file)
@@ -2390,17 +2390,13 @@ void dcn10_set_hdr_multiplier(struct pipe_ctx *pipe_ctx)
        struct fixed31_32 multiplier = pipe_ctx->plane_state->hdr_mult;
        uint32_t hw_mult = 0x1f000; // 1.0 default multiplier
        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.mantissa_bits = 12;
        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);
 
        pipe_ctx->plane_res.dpp->funcs->dpp_set_hdr_multiplier(