drm/amd/display: Remove Phantom Pipe Check When Calculating K1 and K2
authorjsg <jsg@openbsd.org>
Wed, 26 Jul 2023 06:27:30 +0000 (06:27 +0000)
committerjsg <jsg@openbsd.org>
Wed, 26 Jul 2023 06:27:30 +0000 (06:27 +0000)
From Austin Zheng
a2ef3163c3604788abdc060cab74c95ed44fec1a in linux-6.1.y/6.1.40
1966bbfdfe476d271b338336254854c5edd5a907 in mainline linux

sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_hwseq.c

index 74530e2..601b654 100644 (file)
@@ -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);