Commit ed277003 authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher
Browse files

drm/amd/display: Ignore k1/k2 values for virtual signal 



[Why and How]
We are hitting k1/k2 assert when we are using a virtual signal in the
test; as a result, we are failing some automated tests with a false
positive. This commit addresses this issue by ignoring the assert
condition if we use SIGNAL_TYPE_VIRTUAL.

Reviewed-by: default avatarAurabindo Pillai <Aurabindo.Pillai@amd.com>
Acked-by: default avatarWayne Lin <wayne.lin@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2447ba5b

drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c

+3 −0
Original line number Diff line number Diff line
@@ -348,6 +348,9 @@ unsigned int dcn314_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsig 
	two_pix_per_container = optc2_is_two_pixels_per_containter(&stream->timing);

	odm_combine_factor = get_odm_config(pipe_ctx, NULL);



	if (pipe_ctx->stream->signal == SIGNAL_TYPE_VIRTUAL)

		return odm_combine_factor;



	if (is_dp_128b_132b_signal(pipe_ctx)) {

		*k2_div = PIXEL_RATE_DIV_BY_1;

	} else if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal) || dc_is_dvi_signal(pipe_ctx->stream->signal)) {

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

+3 −0
Original line number Diff line number Diff line
@@ -1184,6 +1184,9 @@ unsigned int dcn32_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsign 
	two_pix_per_container = optc2_is_two_pixels_per_containter(&stream->timing);

	odm_combine_factor = get_odm_config(pipe_ctx, NULL);



	if (pipe_ctx->stream->signal == SIGNAL_TYPE_VIRTUAL)

		return odm_combine_factor;



	if (is_dp_128b_132b_signal(pipe_ctx)) {

		*k2_div = PIXEL_RATE_DIV_BY_1;

	} else if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal) || dc_is_dvi_signal(pipe_ctx->stream->signal)) {