diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-11-09 11:24:24 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-11-09 11:24:24 +0000 |
| commit | e11fc656698a8bb81966cd8e913e1e1154e38f2a (patch) | |
| tree | 4cf7e0aeb9fa8846b38f7e0bbd35ba244f4f3e7b /sys | |
| parent | 1efa38c2651b4c66522a3260f3989fe181433506 (diff) | |
drm/amd/display: fix odm combine pipe reset
From Dmytro Laktyushkin
a0d8a590d983d55fc48293ff573ae31a23b3c7d0 in linux 4.19.y/4.19.82
f25f06b67ba237b76092a6fc522b1a94e84bfa85 in mainline linux
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/core/dc_resource.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c index b1e1a9cefbc..c0b4183a814 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c @@ -1399,9 +1399,9 @@ bool dc_remove_plane_from_context( * For head pipe detach surfaces from pipe for tail * pipe just zero it out */ - if (!pipe_ctx->top_pipe || - (!pipe_ctx->top_pipe->top_pipe && + if (!pipe_ctx->top_pipe || (!pipe_ctx->top_pipe->top_pipe && pipe_ctx->top_pipe->stream_res.opp != pipe_ctx->stream_res.opp)) { + pipe_ctx->top_pipe = NULL; pipe_ctx->plane_state = NULL; pipe_ctx->bottom_pipe = NULL; } else { @@ -1803,8 +1803,6 @@ enum dc_status dc_remove_stream_from_ctx( dc->res_pool->funcs->remove_stream_from_ctx(dc, new_ctx, stream); memset(del_pipe, 0, sizeof(*del_pipe)); - - break; } } |