Commit 752e6f28 authored by Melissa Wen's avatar Melissa Wen Committed by Alex Deucher
Browse files

drm/amd/display: remove output_tf_change flag 



Remove this flag as the driver stopped managing it individually since
commit a4056c2a ("drm/amd/display: use HW hdr mult for brightness
boost"). After some back and forth it was reintroduced as a condition to
`set_output_transfer_func()` in [1]. Without direct management, this
flag only changes value when all surface update flags are set true on
UPDATE_TYPE_FULL with no output TF status meaning.

Fixes: bb622e0c ("drm/amd/display: program output tf when required") [1]
Signed-off-by: default avatarMelissa Wen <mwen@igalia.com>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43f06e81

drivers/gpu/drm/amd/display/dc/dc.h

+0 −1
Original line number Diff line number Diff line
@@ -1392,7 +1392,6 @@ union surface_update_flags { 
		uint32_t in_transfer_func_change:1;

		uint32_t input_csc_change:1;

		uint32_t coeff_reduction_change:1;

		uint32_t output_tf_change:1;

		uint32_t pixel_format_change:1;

		uint32_t plane_size_change:1;

		uint32_t gamut_remap_change:1;

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

+2 −4
Original line number Diff line number Diff line
@@ -1983,9 +1983,7 @@ static void dcn20_program_pipe( 
	 */

	if (pipe_ctx->update_flags.bits.enable ||

	    pipe_ctx->update_flags.bits.plane_changed ||

		pipe_ctx->stream->update_flags.bits.out_tf ||

		(pipe_ctx->plane_state &&

			pipe_ctx->plane_state->update_flags.bits.output_tf_change))

	    pipe_ctx->stream->update_flags.bits.out_tf)

		hws->funcs.set_output_transfer_func(dc, pipe_ctx, pipe_ctx->stream);



	/* If the pipe has been enabled or has a different opp, we

drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c

+2 −4
Original line number Diff line number Diff line
@@ -2033,9 +2033,7 @@ void dcn401_program_pipe( 
	 */

	if (pipe_ctx->update_flags.bits.enable ||

	    pipe_ctx->update_flags.bits.plane_changed ||

		pipe_ctx->stream->update_flags.bits.out_tf ||

		(pipe_ctx->plane_state &&

			pipe_ctx->plane_state->update_flags.bits.output_tf_change))

	    pipe_ctx->stream->update_flags.bits.out_tf)

		hws->funcs.set_output_transfer_func(dc, pipe_ctx, pipe_ctx->stream);



	/* If the pipe has been enabled or has a different opp, we