From: Harry Wentland <[email protected]>

Validation expects to operate on non-split pipes. This is
seen in dcn20_fast_validate_bw, which merges pipes for
validation. We weren't doing that in the non-fast path
which lead to validation failures when operating with
4-to-1 MPC and a writeback connector.

Assisted-by: Claude Sonnet 4.5
Reviewed-by: Nicholas Kazlauskas <[email protected]>
Signed-off-by: Harry Wentland <[email protected]>
Signed-off-by: Chuanyu Tseng <[email protected]>
---
 drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c 
b/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
index 66b1a1c2db1d..2c606d9042a2 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
@@ -1645,6 +1645,8 @@ noinline bool dcn30_internal_validate_bw(
        if (!pipes)
                return false;
 
+       dcn20_merge_pipes_for_validate(dc, context);
+
        context->bw_ctx.dml.vba.maxMpcComb = 0;
        context->bw_ctx.dml.vba.VoltageLevel = 0;
        context->bw_ctx.dml.vba.DRAMClockChangeSupport[0][0] = 
dm_dram_clock_change_vactive;
-- 
2.43.0

Reply via email to