| From 6dba7c672176773390f20a1cdc6dea34d9b7f335 Mon Sep 17 00:00:00 2001 |
| From: Wenjing Liu <Wenjing.Liu@amd.com> |
| Date: Wed, 20 Feb 2019 14:00:55 -0500 |
| Subject: drm/amd/display: add pipe lock during stream update |
| |
| [ Upstream commit e6bddf6c67f9a3abf6f1ef75e52bc1cd228dfe4d ] |
| |
| [why] |
| Stream update will adjust both info packets and stream params, |
| need to make sure all things are applied togather. |
| |
| [how] |
| add pipe lock during stream update |
| |
| Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com> |
| Reviewed-by: Jun Lei <Jun.Lei@amd.com> |
| Acked-by: Leo Li <sunpeng.li@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/display/dc/core/dc.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c |
| index c1a308c1dcbea..88fe4fb43bfd5 100644 |
| --- a/drivers/gpu/drm/amd/display/dc/core/dc.c |
| +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c |
| @@ -1677,6 +1677,7 @@ static void commit_planes_do_stream_update(struct dc *dc, |
| continue; |
| |
| if (stream_update->dpms_off) { |
| + dc->hwss.pipe_control_lock(dc, pipe_ctx, true); |
| if (*stream_update->dpms_off) { |
| core_link_disable_stream(pipe_ctx, KEEP_ACQUIRED_RESOURCE); |
| dc->hwss.optimize_bandwidth(dc, dc->current_state); |
| @@ -1684,6 +1685,7 @@ static void commit_planes_do_stream_update(struct dc *dc, |
| dc->hwss.prepare_bandwidth(dc, dc->current_state); |
| core_link_enable_stream(dc->current_state, pipe_ctx); |
| } |
| + dc->hwss.pipe_control_lock(dc, pipe_ctx, false); |
| } |
| |
| if (stream_update->abm_level && pipe_ctx->stream_res.abm) { |
| -- |
| 2.20.1 |
| |
