Skip to content

Commit 0765b2a

Browse files
Dillon Varonealexdeucher
authored andcommitted
drm/amd/display: Block timing sync for different output formats in pmo
[WHY & HOW] If the output format is different for HDMI TMDS signals, they are not synchronizable. Cc: Mario Limonciello <mario.limonciello@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Reviewed-by: Alvin Lee <alvin.lee2@amd.com> Signed-off-by: Dillon Varone <dillon.varone@amd.com> Signed-off-by: Alex Hung <alex.hung@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent f57b77d commit 0765b2a

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,11 @@ static void build_synchronized_timing_groups(
940940
/* find synchronizable timing groups */
941941
for (j = i + 1; j < display_config->display_config.num_streams; j++) {
942942
if (memcmp(master_timing,
943-
&display_config->display_config.stream_descriptors[j].timing,
944-
sizeof(struct dml2_timing_cfg)) == 0 &&
945-
display_config->display_config.stream_descriptors[i].output.output_encoder == display_config->display_config.stream_descriptors[j].output.output_encoder) {
943+
&display_config->display_config.stream_descriptors[j].timing,
944+
sizeof(struct dml2_timing_cfg)) == 0 &&
945+
display_config->display_config.stream_descriptors[i].output.output_encoder == display_config->display_config.stream_descriptors[j].output.output_encoder &&
946+
(display_config->display_config.stream_descriptors[i].output.output_encoder != dml2_hdmi || //hdmi requires formats match
947+
display_config->display_config.stream_descriptors[i].output.output_format == display_config->display_config.stream_descriptors[j].output.output_format)) {
946948
set_bit_in_bitfield(&pmo->scratch.pmo_dcn4.synchronized_timing_group_masks[timing_group_idx], j);
947949
set_bit_in_bitfield(&stream_mapped_mask, j);
948950
}

0 commit comments

Comments
 (0)