drm/amd/display: fix bw_calc for hdmi and 420 outputs

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
index be6e3ca9fb0d07323c0000107561e036c540488d..c809ad3738e9edf32cf12205cc7cb0e1928729c1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
@@ -923,8 +923,10 @@ bool dcn_validate_bandwidth(
                if (v->is_line_buffer_bpp_fixed == dcn_bw_yes)
                        v->lb_bit_per_pixel[input_idx] = v->line_buffer_fixed_bpp;
                v->dcc_rate[input_idx] = 1; /*TODO: Worst case? does this change?*/
-               v->output_format[input_idx] = dcn_bw_444;
-               v->output[input_idx] = dcn_bw_dp;
+               v->output_format[input_idx] = pipe->stream->timing.pixel_encoding ==
+                               PIXEL_ENCODING_YCBCR420 ? dcn_bw_420 : dcn_bw_444;
+               v->output[input_idx] = pipe->stream->sink->sink_signal ==
+                               SIGNAL_TYPE_HDMI_TYPE_A ? dcn_bw_hdmi : dcn_bw_dp;
 
                input_idx++;
        }