[PATCH AUTOSEL 6.1 14/61] drm/amd/display: Skip inactive planes within ModeSupportAndSystemConfiguration

[Sasha Levin]

From: Hersen Wu <hersenxs...@amd.com>

[ Upstream commit a54f7e866cc73a4cb71b8b24bb568ba35c8969df ]

[Why]
Coverity reports Memory - illegal accesses.

[How]
Skip inactive planes.

Reviewed-by: Alex Hung <alex.h...@amd.com>
Acked-by: Tom Chung <chiahsuan.ch...@amd.com>
Signed-off-by: Hersen Wu <hersenxs...@amd.com>
Tested-by: Daniel Wheeler <daniel.whee...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c 
b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
index 1070cf8701960..b2ad56c459ba6 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -1099,8 +1099,13 @@ void ModeSupportAndSystemConfiguration(struct 
display_mode_lib *mode_lib)
 
        // Total Available Pipes Support Check
        for (k = 0; k < mode_lib->vba.NumberOfActivePlanes; ++k) {
-               total_pipes += mode_lib->vba.DPPPerPlane[k];
                pipe_idx = get_pipe_idx(mode_lib, k);
+               if (pipe_idx == -1) {
+                       ASSERT(0);
+                       continue; // skip inactive planes
+               }
+               total_pipes += mode_lib->vba.DPPPerPlane[k];
+
                if (mode_lib->vba.cache_pipes[pipe_idx].clks_cfg.dppclk_mhz > 
0.0)
                        mode_lib->vba.DPPCLK[k] = 
mode_lib->vba.cache_pipes[pipe_idx].clks_cfg.dppclk_mhz;
                else
-- 
2.43.0