[PATCH 6.1.y] Revert "drm/amd/display: Remove Phantom Pipe Check When Calculating K1 and K2"

[PATCH 6.1.y] Revert "drm/amd/display: Remove Phantom Pipe Check When Calculating K1 and K2"

[tiancyin]

This reverts commit a2ef3163c3604788abdc060cab74c95ed44fec1a.
---
 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
index f5fa7abd97fc..2f4afe40f3e6 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
@@ -1165,6 +1165,10 @@ 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);
 
-- 
2.34.1

Re: [PATCH 6.1.y] Revert "drm/amd/display: Remove Phantom Pipe Check When Calculating K1 and K2"

[Greg KH]

On Mon, Aug 07, 2023 at 10:18:12AM +0800, tiancyin wrote:
> This reverts commit a2ef3163c3604788abdc060cab74c95ed44fec1a.
> ---
>  drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
> index f5fa7abd97fc..2f4afe40f3e6 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
> @@ -1165,6 +1165,10 @@ 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);
>  
> -- 
> 2.34.1
> 

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>