drm/amd/display: populate subvp cmd info only for the top pipe
authorAyush Gupta <ayush.gupta@amd.com>
Fri, 10 Feb 2023 18:02:09 +0000 (13:02 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 28 Feb 2023 19:29:36 +0000 (14:29 -0500)
[Why]
System restart observed while changing the display resolution
to 8k with extended mode. Sytem restart was caused by a page fault.

[How]
When the driver populates subvp info it did it for both the pipes using
vblank which caused an outof bounds array access causing the page fault.
added checks to allow the top pipe only to fix this issue.

Co-authored-by: Ayush Gupta <ayush.gupta@amd.com>
Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Ayush Gupta <ayush.gupta@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c

index c2092775ca88faf393b683cd639cb5c765094980..7f27e29fae11607dba18e14675c5dcc49d3b1e21 100644 (file)
@@ -750,7 +750,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++);