[PATCH 4.19 244/276] drm/amd/display: fix releasing planes when exiting odm

[Greg Kroah-Hartman]

[ Upstream commit bc2193992b00488f5734613ac95b78ef2d2803ab ]

Releasing planes should not release the 2nd odm pipe right away,
this change leaves us with 2 pipes with null planes and same stream
when planes are released during odm.

Signed-off-by: Dmytro Laktyushkin <dmytro.laktyush...@amd.com>
Reviewed-by: Tony Cheng <tony.ch...@amd.com>
Acked-by: Bhawanpreet Lakha <bhawanpreet.la...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c 
b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 87bf422f16be7..e0a96abb3c46c 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1401,10 +1401,12 @@ 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) {
+                       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->plane_state = NULL;
                                pipe_ctx->bottom_pipe = NULL;
-                       } else  {
+                       } else {
                                memset(pipe_ctx, 0, sizeof(*pipe_ctx));
                        }
                }
-- 
2.20.1