diff options
| author | Alex Hung <alex.hung@amd.com> | 2023-10-11 13:18:44 -0600 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-10-13 11:15:10 -0400 |
| commit | c1929159f727bbe3bf5e3e7b07030181b5ee36b7 (patch) | |
| tree | 4f8fc7a664642b7bbf99210d586f5b3db1c3b797 | |
| parent | 8f4bdbc8e99db6ec9cb0520748e49a2f2d7d1727 (diff) | |
Revert "drm/amd/display: Fix writeback_info never got updated"
This reverts commit 8a307777c36e15f38c9f23778babcd368144c7d8.
[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.c | 13 |
1 files changed, 9 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 0da82fcd4cc5..46f6f1079034 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c @@ -509,13 +509,18 @@ 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 */ memcpy(&stream->writeback_info[j], &stream->writeback_info[i], |