summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Hung <alex.hung@amd.com>2023-10-11 13:18:36 -0600
committerAlex Deucher <alexander.deucher@amd.com>2023-10-13 11:11:29 -0400
commite3c88c44e09f0ecf77ab99250df2fb34cab6c2ca (patch)
tree7546fbb69509770c8cfeced995c438adef5a108c
parent731a20cb89e6ea1bd2d74bb5f615ddd3cadc52f3 (diff)
Revert "drm/amd/display: Fix writeback_info is not removed"
This reverts commit 5b89d2ccc8466e0445a4994cb288fc009b565de5. [WHY & HOW] The writeback series cause a regression in thunderbolt display. Signed-off-by: Alex Hung <alex.hung@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_stream.c7
1 files changed, 3 insertions, 4 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 aae27330cede..0da82fcd4cc5 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -516,12 +516,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;
- /* trim the array */
- if (j < i) {
+ if (j < i)
+ /* trim the array */
memcpy(&stream->writeback_info[j], &stream->writeback_info[i],
sizeof(struct dc_writeback_info));
- j++;
- }
+ j++;
}
}
stream->num_wb_info = j;