drm/amd/display: populate subvp cmd info only for the top pipe

From Ayush Gupta
92e6c79acad4b96efeff261d27bdbd8089a7dd24 in linux-6.1.y/6.1.30
9bb10b7aaec3b6278f9cc410c17dcaa129bbbbf0 in mainline linux

diff --git a/sys/dev/pci/drm/amd/display/dc/dc_dmub_srv.c b/sys/dev/pci/drm/amd/display/dc/dc_dmub_srv.c
index 0541e87..a461e94 100644 (file)
--- a/sys/dev/pci/drm/amd/display/dc/dc_dmub_srv.c
+++ b/sys/dev/pci/drm/amd/display/dc/dc_dmub_srv.c
@@ -764,7 +764,8 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc,
                                        !pipe->top_pipe && !pipe->prev_odm_pipe &&
                                        pipe->stream->mall_stream_config.type == SUBVP_MAIN) {
                                populate_subvp_cmd_pipe_info(dc, context, &cmd, pipe, cmd_pipe_index++);
-                       } else if (pipe->plane_state && pipe->stream->mall_stream_config.type == SUBVP_NONE) {
+                       } else if (pipe->plane_state && pipe->stream->mall_stream_config.type == SUBVP_NONE &&
+                                   !pipe->top_pipe && !pipe->prev_odm_pipe) {
                                // Don't need to check for ActiveDRAMClockChangeMargin < 0, not valid in cases where
                                // we run through DML without calculating "natural" P-state support
                                populate_subvp_cmd_vblank_pipe_info(dc, context, &cmd, pipe, cmd_pipe_index++);