]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/amd/display: update infoframe after dig fe is turned on (v2)
authorNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Mon, 24 Jun 2019 17:14:14 +0000 (13:14 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Jun 2019 18:24:03 +0000 (13:24 -0500)
[Why]
The AVI infoframe is incorrectly programmed on DCN1/2 when enabling a
stream - causing the wrong pixel encoding to be used for display.

This is because the AVI infoframe is programmed before the DIG BE is
connected to the FE and turned on, so enabling the AFMT block doesn't
actually work and the registers subsequently can't be written to.

[How]
Program the infoframe *after* turning on the DIG FE. This was the
behavior previously used but it was incorrectly reverted
when adding the DCN2 HW sequencer code.

v2: Don't call update_info_frame twice

Fixes: 7ed4e6352c16fe01 ("drm/amd/display: Add DCN2 HW Sequencer and Resource")
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

index 5f69f05fb71198f0771c7771ccf610a52bf2b135..858a58856ebd0c2cf98df0508c7f6d8376070503 100644 (file)
@@ -689,6 +689,7 @@ void dce110_enable_stream(struct pipe_ctx *pipe_ctx)
                                                        dmdata_dp : dmdata_hdmi);
        }
 #endif
+       dce110_update_info_frame(pipe_ctx);
 
        /* enable early control to avoid corruption on DP monitor*/
        active_total_with_borders =