diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1651-drm-amd-display-fix-odm-combine-pipe-reset.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1651-drm-amd-display-fix-odm-combine-pipe-reset.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1651-drm-amd-display-fix-odm-combine-pipe-reset.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1651-drm-amd-display-fix-odm-combine-pipe-reset.patch new file mode 100644 index 00000000..d38082fa --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1651-drm-amd-display-fix-odm-combine-pipe-reset.patch @@ -0,0 +1,44 @@ +From 289fd55a829eea7c0598435ba347e1a24eec3b30 Mon Sep 17 00:00:00 2001 +From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> +Date: Fri, 8 Mar 2019 16:44:53 -0500 +Subject: [PATCH 1651/2940] drm/amd/display: fix odm combine pipe reset + +We fail to reset the second odm combine pipe. This change fixes +odm pointer management. + +Change-Id: Ie4084f696636636a5965c9d75bb6291eb0626fa9 +Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 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 2e8030f8fed4..1edba6c1b275 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -1293,9 +1293,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 { +@@ -1727,8 +1727,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; + } + } + +-- +2.17.1 + |