diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2812-drm-amd-display-Remove-dangling-planes-on-dc-commit-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2812-drm-amd-display-Remove-dangling-planes-on-dc-commit-.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2812-drm-amd-display-Remove-dangling-planes-on-dc-commit-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2812-drm-amd-display-Remove-dangling-planes-on-dc-commit-.patch new file mode 100644 index 00000000..86562308 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2812-drm-amd-display-Remove-dangling-planes-on-dc-commit-.patch @@ -0,0 +1,84 @@ +From 96114971f776e788fbf7684d59b6975a5d947109 Mon Sep 17 00:00:00 2001 +From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com> +Date: Tue, 7 Nov 2017 13:21:02 -0500 +Subject: [PATCH 2812/4131] drm/amd/display: Remove dangling planes on dc + commit state + +When disabling pipe splitting, we need to make sure we disable both +planes used. + +This should be done for Linux as well. + +Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 37 ++++++++++++++++++++++++++++++-- + 1 file changed, 35 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index 9acff3e..708300e 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -417,6 +417,39 @@ static bool construct(struct dc *dc, + return false; + } + ++static void disable_dangling_plane(struct dc *dc, struct dc_state *context) ++{ ++ int i, j; ++ struct dc_state *dangling_context = dc_create_state(); ++ struct dc_state *current_ctx; ++ ++ if (dangling_context == NULL) ++ return; ++ ++ dc_resource_state_copy_construct(dc->current_state, dangling_context); ++ ++ for (i = 0; i < dc->res_pool->pipe_count; i++) { ++ struct dc_stream_state *old_stream = ++ dc->current_state->res_ctx.pipe_ctx[i].stream; ++ bool should_disable = true; ++ ++ for (j = 0; j < context->stream_count; j++) { ++ if (old_stream == context->streams[j]) { ++ should_disable = false; ++ break; ++ } ++ } ++ if (should_disable && old_stream) { ++ dc_rem_all_planes_for_stream(dc, old_stream, dangling_context); ++ dc->hwss.apply_ctx_for_surface(dc, old_stream, 0, dangling_context); ++ } ++ } ++ ++ current_ctx = dc->current_state; ++ dc->current_state = dangling_context; ++ dc_release_state(current_ctx); ++} ++ + /******************************************************************************* + * Public functions + ******************************************************************************/ +@@ -622,6 +655,8 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c + int i, k, l; + struct dc_stream_state *dc_streams[MAX_STREAMS] = {0}; + ++ disable_dangling_plane(dc, context); ++ + for (i = 0; i < context->stream_count; i++) + dc_streams[i] = context->streams[i]; + +@@ -686,8 +721,6 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c + } + } + +- +- + CONN_MSG_MODE(sink->link, "{%dx%d, %dx%d@%dKhz}", + context->streams[i]->timing.h_addressable, + context->streams[i]->timing.v_addressable, +-- +2.7.4 + |