[PATCH AUTOSEL 6.1 14/53] drm/amd/display: Fix writeback_info never got updated

[Sasha Levin]

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

[ Upstream commit 8a307777c36e15f38c9f23778babcd368144c7d8 ]

[WHY]
wb_enabled field is set to false before it is used, and the following
code will never be executed.

[HOW]
Setting wb_enable to false after all removal work is completed.

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 | 13 ++++---------
 1 file changed, 4 insertions(+), 9 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 556c57c390ff..12b73b0ff19e 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -514,18 +514,13 @@ bool dc_stream_remove_writeback(struct dc *dc,
                return false;
        }
 
-//     stream->writeback_info[dwb_pipe_inst].wb_enabled = false;
-       for (i = 0; i < stream->num_wb_info; i++) {
-               /*dynamic update*/
-               if (stream->writeback_info[i].wb_enabled &&
-                       stream->writeback_info[i].dwb_pipe_inst == 
dwb_pipe_inst) {
-                       stream->writeback_info[i].wb_enabled = false;
-               }
-       }
-
        /* remove writeback info for disabled writeback pipes from stream */
        for (i = 0, j = 0; i < stream->num_wb_info; i++) {
                if (stream->writeback_info[i].wb_enabled) {
+
+                       if (stream->writeback_info[i].dwb_pipe_inst == 
dwb_pipe_inst)
+                               stream->writeback_info[i].wb_enabled = false;
+
                        if (j < i)
                                /* trim the array */
                                stream->writeback_info[j] = 
stream->writeback_info[i];
-- 
2.43.0