Skip to content

Commit 0ac86f7

Browse files
Aurabindo Pillaigregkh
authored andcommitted
drm/amd/display: fix k1 k2 divider programming for phantom streams
[ Upstream commit 3b214bb ] [Why & How] When k1 and k2 divider programming logic is executed for a phantom stream, the corresponding master stream should be used for the calculation. Fix the if condition to use the master stream for checking signal type instead of the phantom stream. Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com> Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com> Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Stable-dep-of: 709671f ("drm/amd/display: Remove OTG DIV register write for Virtual signals.") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4a36da1 commit 0ac86f7

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,13 +1174,13 @@ unsigned int dcn32_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsign
11741174
if (is_dp_128b_132b_signal(pipe_ctx)) {
11751175
*k1_div = PIXEL_RATE_DIV_BY_1;
11761176
*k2_div = PIXEL_RATE_DIV_BY_1;
1177-
} else if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal) || dc_is_dvi_signal(pipe_ctx->stream->signal)) {
1177+
} else if (dc_is_hdmi_tmds_signal(stream->signal) || dc_is_dvi_signal(stream->signal)) {
11781178
*k1_div = PIXEL_RATE_DIV_BY_1;
11791179
if (stream->timing.pixel_encoding == PIXEL_ENCODING_YCBCR420)
11801180
*k2_div = PIXEL_RATE_DIV_BY_2;
11811181
else
11821182
*k2_div = PIXEL_RATE_DIV_BY_4;
1183-
} else if (dc_is_dp_signal(pipe_ctx->stream->signal) || dc_is_virtual_signal(pipe_ctx->stream->signal)) {
1183+
} else if (dc_is_dp_signal(stream->signal) || dc_is_virtual_signal(stream->signal)) {
11841184
if (two_pix_per_container) {
11851185
*k1_div = PIXEL_RATE_DIV_BY_1;
11861186
*k2_div = PIXEL_RATE_DIV_BY_2;

0 commit comments

Comments
 (0)