From: Tony Cheng <[email protected]> [Why] The DCN4 DC2 commit programs OPP and TG stereo twice in a row for a stream whose mode changed. Both times use the same values.
[How] Remove the first, mode-changed-only stereo steps. Remove the skip flag that only these steps used. Cc: Jun Lei <[email protected]> Signed-off-by: Tony Cheng <[email protected]> Signed-off-by: Wayne Lin <[email protected]> --- .../dc/bls_builder/bls_builder_private_types.h | 2 -- .../dc/bls_builder/dcn401_non_seamless_builder.c | 11 ++++------- .../display/dc/bls_builder/dcn401_seamless_builder.c | 3 --- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder_private_types.h b/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder_private_types.h index 0e6733eba83d..784a3cb4d311 100644 --- a/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder_private_types.h +++ b/drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder_private_types.h @@ -107,8 +107,6 @@ struct dcn401_commit_step_meta { } dc_ip_request_cntl; }; struct { - /* The OTG master's stream has mode_changed clear. */ - bool stream_mode_unchanged; /* The new state has a stream. */ bool new_state_has_stream; /* dc->optimized_required is clear. */ diff --git a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c index e379793a8efd..d28e162a6632 100644 --- a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c +++ b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_non_seamless_builder.c @@ -318,9 +318,10 @@ static const struct dcn401_commit_step /* * Net effect: finish the head for the new OTG master. program_front_end * for a master with no plane, then stereo, then the waits that complete - * the head's double buffering. legacy_commit_state_hw sets up stereo for - * a mode-changed stream, then dc_enable_stereo sets it up again for every - * stream; dcn10_setup_stereo with no 3D format is the two STEREO calls. + * the head's double buffering. DC1 sets up stereo twice for a + * mode-changed stream, in legacy_commit_state_hw and dc_enable_stereo, + * with the same result; one dcn10_setup_stereo with no 3D format, the two + * STEREO calls, matches it. * The bandwidth lower starts only after these waits. */ static const struct dcn401_commit_step @@ -335,10 +336,6 @@ static const struct dcn401_commit_step { .func = TG_LOCK, .meta.tg_lock.lock = false }, { .func = HUBBUB_FORCE_PSTATE_CHANGE_CONTROL }, - { .func = OPP_PROGRAM_STEREO, - .meta.skip_if.stream_mode_unchanged = true }, - { .func = TG_PROGRAM_STEREO, - .meta.skip_if.stream_mode_unchanged = true }, { .func = OPP_PROGRAM_STEREO }, { .func = TG_PROGRAM_STEREO }, diff --git a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c index b7f6909d69e0..23951ef4fe04 100644 --- a/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c +++ b/drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_seamless_builder.c @@ -1944,9 +1944,6 @@ static void dcn401_add_step(struct block_sequence_state *sequence, static bool dcn401_skip_step(const struct dcn401_commit_step_args *args, const struct dcn401_commit_step *step) { - if (step->meta.skip_if.stream_mode_unchanged && - !args->pipe->stream->mode_changed) - return true; if (step->meta.skip_if.new_state_has_stream && args->new_state->stream_count) return true; -- 2.43.0
