From: jsg <jsg@openbsd.org>
Date: Wed, 26 Jul 2023 06:27:30 +0000 (+0000)
Subject: drm/amd/display: Remove Phantom Pipe Check When Calculating K1 and K2
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=97ef61d01253640ceb9737f6eddb7af94be9cc60;p=openbsd

drm/amd/display: Remove Phantom Pipe Check When Calculating K1 and K2

From Austin Zheng
a2ef3163c3604788abdc060cab74c95ed44fec1a in linux-6.1.y/6.1.40
1966bbfdfe476d271b338336254854c5edd5a907 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_hwseq.c b/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_hwseq.c
index 74530e2e79c..601b65483ef 100644
--- a/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_hwseq.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_hwseq.c
@@ -1165,10 +1165,6 @@ unsigned int dcn32_calculate_dccg_k1_k2_values(struct pipe_ctx *pipe_ctx, unsign
 	unsigned int odm_combine_factor = 0;
 	bool two_pix_per_container = false;
 
-	// For phantom pipes, use the same programming as the main pipes
-	if (pipe_ctx->stream->mall_stream_config.type == SUBVP_PHANTOM) {
-		stream = pipe_ctx->stream->mall_stream_config.paired_stream;
-	}
 	two_pix_per_container = optc2_is_two_pixels_per_containter(&stream->timing);
 	odm_combine_factor = get_odm_config(pipe_ctx, NULL);