drm/amd/display: fix a regression in blank pixel data caused by coding mistake

[why]
There was unfortunately a coding mistake. It gets caught with an ultrawide monitor
that requires ODM 4:1 combine. We are blanking or unblanking pixel data we
are supposed to enumerate through all ODM pipes and program DPG for each
of those pipes. However the coding mistake causes us to program only the
first and last ODM pipes.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Reviewed-by: Martin Leung <martin.leung@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
index fc1af33dbe3c9c27ac7d0f3fd66fc681d254a36d..b196b7ff1a0d1f74a282626cf12db6000cf7d297 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -1084,7 +1084,7 @@ void dcn20_blank_pixel_data(
 
        while (odm_pipe->next_odm_pipe) {
                dc->hwss.set_disp_pattern_generator(dc,
-                               pipe_ctx,
+                               odm_pipe,
                                test_pattern,
                                test_pattern_color_space,
                                stream->timing.display_color_depth,

diff --git a/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c b/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c
index bce0428ad6123a88e28b69a131e0336da4020f4a..9fd68a11fad23d1cc248041af5853a2ad113ce37 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c
+++ b/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c
@@ -513,7 +513,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
                                odm_opp = odm_pipe->stream_res.opp;
                                odm_opp->funcs->opp_program_bit_depth_reduction(odm_opp, &params);
                                link->dc->hwss.set_disp_pattern_generator(link->dc,
-                                               pipe_ctx,
+                                               odm_pipe,
                                                controller_test_pattern,
                                                controller_color_space,
                                                color_depth,