Skip to content

Commit 41b1f9f

Browse files
melissawenalexdeucher
authored andcommitted
drm/amd/display: remove output_tf_change flag
Remove this flag as the driver stopped managing it individually since commit a4056c2 ("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: bb622e0 ("drm/amd/display: program output tf when required") [1] Signed-off-by: Melissa Wen <mwen@igalia.com> Reviewed-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 752e6f2)
1 parent 361ee85 commit 41b1f9f

3 files changed

Lines changed: 4 additions & 9 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,6 @@ union surface_update_flags {
13481348
uint32_t in_transfer_func_change:1;
13491349
uint32_t input_csc_change:1;
13501350
uint32_t coeff_reduction_change:1;
1351-
uint32_t output_tf_change:1;
13521351
uint32_t pixel_format_change:1;
13531352
uint32_t plane_size_change:1;
13541353
uint32_t gamut_remap_change:1;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,10 +1982,8 @@ static void dcn20_program_pipe(
19821982
* updating on slave planes
19831983
*/
19841984
if (pipe_ctx->update_flags.bits.enable ||
1985-
pipe_ctx->update_flags.bits.plane_changed ||
1986-
pipe_ctx->stream->update_flags.bits.out_tf ||
1987-
(pipe_ctx->plane_state &&
1988-
pipe_ctx->plane_state->update_flags.bits.output_tf_change))
1985+
pipe_ctx->update_flags.bits.plane_changed ||
1986+
pipe_ctx->stream->update_flags.bits.out_tf)
19891987
hws->funcs.set_output_transfer_func(dc, pipe_ctx, pipe_ctx->stream);
19901988

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

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,10 +2019,8 @@ void dcn401_program_pipe(
20192019
* updating on slave planes
20202020
*/
20212021
if (pipe_ctx->update_flags.bits.enable ||
2022-
pipe_ctx->update_flags.bits.plane_changed ||
2023-
pipe_ctx->stream->update_flags.bits.out_tf ||
2024-
(pipe_ctx->plane_state &&
2025-
pipe_ctx->plane_state->update_flags.bits.output_tf_change))
2022+
pipe_ctx->update_flags.bits.plane_changed ||
2023+
pipe_ctx->stream->update_flags.bits.out_tf)
20262024
hws->funcs.set_output_transfer_func(dc, pipe_ctx, pipe_ctx->stream);
20272025

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

0 commit comments

Comments
 (0)