]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/amd/display: Only update output transfer function for full type.
authorYongqiang Sun <yongqiang.sun@amd.com>
Fri, 10 Nov 2017 20:40:52 +0000 (15:40 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 6 Dec 2017 17:48:09 +0000 (12:48 -0500)
dcn10_translate_regamma_to_hw_format costs 750us to run, it cannot be
called within isr, check update flag before calling, only do it for
full update.

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

index ad0e3b9be05511b8743b4b3873c86c3114dd42b3..39869d379e3fea2d4dac5e67d4bf2259af88770c 100644 (file)
@@ -1211,9 +1211,17 @@ dcn10_set_output_transfer_func(struct pipe_ctx *pipe_ctx,
            stream->out_transfer_func->type == TF_TYPE_PREDEFINED &&
            stream->out_transfer_func->tf == TRANSFER_FUNCTION_SRGB)
                dpp->funcs->dpp_program_regamma_pwl(dpp, NULL, OPP_REGAMMA_SRGB);
-       else if (dcn10_translate_regamma_to_hw_format(stream->out_transfer_func, &dpp->regamma_params))
-               dpp->funcs->dpp_program_regamma_pwl(dpp, &dpp->regamma_params, OPP_REGAMMA_USER);
-       else
+
+       /* dcn10_translate_regamma_to_hw_format takes 750us, only do it when full
+        * update.
+        */
+       else if (dcn10_translate_regamma_to_hw_format(
+                       stream->out_transfer_func,
+                       &dpp->regamma_params)) {
+               dpp->funcs->dpp_program_regamma_pwl(
+                               dpp,
+                               &dpp->regamma_params, OPP_REGAMMA_USER);
+       } else
                dpp->funcs->dpp_program_regamma_pwl(dpp, NULL, OPP_REGAMMA_BYPASS);
 
        return true;
@@ -2076,16 +2084,17 @@ static void program_all_pipe_in_tree(
 
                update_dchubp_dpp(dc, pipe_ctx, context);
 
-               if (cur_pipe_ctx->plane_state != pipe_ctx->plane_state) {
+               if (cur_pipe_ctx->plane_state != pipe_ctx->plane_state)
                        dc->hwss.set_input_transfer_func(pipe_ctx, pipe_ctx->plane_state);
-               }
 
-               /*
+               /* dcn10_translate_regamma_to_hw_format takes 750us to finish
+                * only do gamma programming for full update.
                 * TODO: This can be further optimized/cleaned up
                 * Always call this for now since it does memcmp inside before
                 * doing heavy calculation and programming
                 */
-               dc->hwss.set_output_transfer_func(pipe_ctx, pipe_ctx->stream);
+               if (pipe_ctx->plane_state->update_flags.bits.full_update)
+                       dc->hwss.set_output_transfer_func(pipe_ctx, pipe_ctx->stream);
        }
 
        if (dc->debug.sanity_checks) {