Skip to content

Commit 38e3285

Browse files
Dillon Varonealexdeucher
authored andcommitted
drm/amd/display: Block timing sync for different signals in PMO
PMO assumes that like timings can be synchronized, but DC only allows this if the signal types match. Reviewed-by: Austin Zheng <austin.zheng@amd.com> Signed-off-by: Dillon Varone <dillon.varone@amd.com> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 29d3d6a) Cc: stable@vger.kernel.org
1 parent 53c3685 commit 38e3285

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,8 @@ static void build_synchronized_timing_groups(
811811
for (j = i + 1; j < display_config->display_config.num_streams; j++) {
812812
if (memcmp(master_timing,
813813
&display_config->display_config.stream_descriptors[j].timing,
814-
sizeof(struct dml2_timing_cfg)) == 0) {
814+
sizeof(struct dml2_timing_cfg)) == 0 &&
815+
display_config->display_config.stream_descriptors[i].output.output_encoder == display_config->display_config.stream_descriptors[j].output.output_encoder) {
815816
set_bit_in_bitfield(&pmo->scratch.pmo_dcn4.synchronized_timing_group_masks[timing_group_idx], j);
816817
set_bit_in_bitfield(&stream_mapped_mask, j);
817818
}

0 commit comments

Comments
 (0)