[PATCH AUTOSEL 6.1 15/53] drm/amd/display: Fix writeback_info is not removed

[Sasha Levin]

From: Alex Hung <alex.h...@amd.com>

[ Upstream commit 5b89d2ccc8466e0445a4994cb288fc009b565de5 ]

[WHY]
Counter j was not updated to present the num of writeback_info when
writeback pipes are removed.

[HOW]
update j (num of writeback info) under the correct condition.

Reviewed-by: Harry Wentland <harry.wentl...@amd.com>
Signed-off-by: Alex Hung <alex.h...@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/core/dc_stream.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c 
b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
index 12b73b0ff19e..b59db6c95820 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -521,10 +521,11 @@ bool dc_stream_remove_writeback(struct dc *dc,
                        if (stream->writeback_info[i].dwb_pipe_inst == 
dwb_pipe_inst)
                                stream->writeback_info[i].wb_enabled = false;
 
-                       if (j < i)
-                               /* trim the array */
+                       /* trim the array */
+                       if (j < i) {
                                stream->writeback_info[j] = 
stream->writeback_info[i];
-                       j++;
+                               j++;
+                       }
                }
        }
        stream->num_wb_info = j;
-- 
2.43.0