aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2558-drm-amd-display-fix-null-dereference-in-reset-hw-ctx.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2558-drm-amd-display-fix-null-dereference-in-reset-hw-ctx.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2558-drm-amd-display-fix-null-dereference-in-reset-hw-ctx.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2558-drm-amd-display-fix-null-dereference-in-reset-hw-ctx.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2558-drm-amd-display-fix-null-dereference-in-reset-hw-ctx.patch
new file mode 100644
index 00000000..5b49e1f6
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2558-drm-amd-display-fix-null-dereference-in-reset-hw-ctx.patch
@@ -0,0 +1,29 @@
+From 0ee2825a8e3828dcdafc4a83d37be2e13eed3964 Mon Sep 17 00:00:00 2001
+From: Eric Yang <Eric.Yang2@amd.com>
+Date: Thu, 5 Oct 2017 16:00:29 -0400
+Subject: [PATCH 2558/4131] drm/amd/display: fix null dereference in reset hw
+ ctx
+
+Signed-off-by: Eric Yang <Eric.Yang2@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <Harry.Wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+index 95edce0..ca4990d 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+@@ -1872,7 +1872,7 @@ static void dce110_reset_hw_ctx_wrap(
+ struct clock_source *old_clk = pipe_ctx_old->clock_source;
+
+ /* disable already, no need to disable again */
+- if (!pipe_ctx->stream->dpms_off)
++ if (pipe_ctx->stream && !pipe_ctx->stream->dpms_off)
+ core_link_disable_stream(pipe_ctx_old, FREE_ACQUIRED_RESOURCE);
+
+ pipe_ctx_old->stream_res.tg->funcs->set_blank(pipe_ctx_old->stream_res.tg, true);
+--
+2.7.4
+