From: Vladimir Stempen <vladimir.stem...@amd.com>
[Why]
On secondary display hotplug we switch primary
stream from ODM2to1 to ODMBypass mode. Current
logic will trigger disabling front end for this
stream.
[How]
We need to check if prev_odm_pipe is equal to NULL
in order to disable dangling planes in this scenario.
Reviewed-by: Ariel Bernstein <eric.bernst...@amd.com>
Acked-by: Brian Chang <brian.ch...@amd.com>
Signed-off-by: Vladimir Stempen <vladimir.stem...@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c
b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 1ca76708705b..6a28f3e0ceb4 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1097,7 +1097,8 @@ static void disable_dangling_plane(struct dc *dc, struct
dc_state *context)
dc->current_state->stream_count !=
context->stream_count)
should_disable = true;
- if (old_stream &&
!dc->current_state->res_ctx.pipe_ctx[i].top_pipe) {
+ if (old_stream &&
!dc->current_state->res_ctx.pipe_ctx[i].top_pipe &&
+
!dc->current_state->res_ctx.pipe_ctx[i].prev_odm_pipe) {
struct pipe_ctx *old_pipe, *new_pipe;
old_pipe = &dc->current_state->res_ctx.pipe_ctx[i];
--
2.25.1
