aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1010-drm-amd-display-work-around-for-8k-sleep-crash.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1010-drm-amd-display-work-around-for-8k-sleep-crash.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1010-drm-amd-display-work-around-for-8k-sleep-crash.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1010-drm-amd-display-work-around-for-8k-sleep-crash.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1010-drm-amd-display-work-around-for-8k-sleep-crash.patch
deleted file mode 100644
index 86eba802..00000000
--- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1010-drm-amd-display-work-around-for-8k-sleep-crash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9e239a3a9f922adbb09084d77508fc9c327e8064 Mon Sep 17 00:00:00 2001
-From: Yongqiang Sun <yongqiang.sun@amd.com>
-Date: Thu, 24 Aug 2017 17:29:24 -0400
-Subject: [PATCH 1010/4131] drm/amd/display: work around for 8k sleep crash
-
-Change-Id: I1a7819cdb737b9cdab31479c91a389119f23b296
-Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
-Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
-Acked-by: Harry Wentland <Harry.Wentland@amd.com>
----
- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 1 +
- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
-index 5e5766a..6c85a54 100644
---- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
-+++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
-@@ -581,6 +581,7 @@ static void split_stream_across_pipes(
- secondary_pipe->plane_res.ipp = pool->ipps[secondary_pipe->pipe_idx];
- secondary_pipe->plane_res.xfm = pool->transforms[secondary_pipe->pipe_idx];
- if (primary_pipe->bottom_pipe) {
-+ ASSERT(primary_pipe->bottom_pipe != secondary_pipe);
- secondary_pipe->bottom_pipe = primary_pipe->bottom_pipe;
- secondary_pipe->bottom_pipe->top_pipe = secondary_pipe;
- }
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
-index bd02329..498680a 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
-+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
-@@ -2358,7 +2358,7 @@ static void program_all_pipe_in_tree(
- verify_allow_pstate_change_high(dc->hwseq);
- }
-
-- if (pipe_ctx->bottom_pipe != NULL)
-+ if (pipe_ctx->bottom_pipe != NULL && pipe_ctx->bottom_pipe != pipe_ctx)
- program_all_pipe_in_tree(dc, pipe_ctx->bottom_pipe, context);
- }
-
---
-2.7.4
-