diff options
| author |   Alex Hung <alex.hung@amd.com> | 2023-10-11 13:18:34 -0600 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2023-10-13 11:08:57 -0400 |
| commit | 731a20cb89e6ea1bd2d74bb5f615ddd3cadc52f3 (patch) | |
| tree | 35daa3f6094fc836fd5f6af3e11a0d4d922fa606 | |
| parent | Revert "drm/amd/display: Setup for mmhubbub3_warmup_mcif with big buffer" (diff) | |
| download | linux-rng-731a20cb89e6ea1bd2d74bb5f615ddd3cadc52f3.tar.xz linux-rng-731a20cb89e6ea1bd2d74bb5f615ddd3cadc52f3.zip | |
Revert "drm/amd/display: Add writeback enable field (wb_enabled)"
This reverts commit f6893fcb10c7b24526454e465f6ec2563ef044cc.
[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/amdgpu/amdgpu_mode.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index d8083972e393..a166d7684719 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h @@ -418,7 +418,6 @@ struct amdgpu_crtc { struct drm_pending_vblank_event *event; bool wb_pending; - bool wb_enabled; struct drm_writeback_connector *wb_conn; }; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 3a451805a513..47b309c4d030 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8676,13 +8676,9 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, if (acrtc) old_crtc_state = drm_atomic_get_old_crtc_state(state, &acrtc->base); - if (!acrtc->wb_enabled) - continue; - dm_old_crtc_state = to_dm_crtc_state(old_crtc_state); dm_clear_writeback(dm, dm_old_crtc_state); - acrtc->wb_enabled = false; } for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, @@ -9260,13 +9256,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) if (acrtc) new_crtc_state = drm_atomic_get_new_crtc_state(state, &acrtc->base); - if (acrtc->wb_enabled) - continue; - dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); dm_set_writeback(dm, dm_new_crtc_state, connector, new_con_state); - acrtc->wb_enabled = true; } /* Update audio instances for each connector. */ |