aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/0176-drm-amd-display-Check-we-got-a-stream-in-update_info.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0176-drm-amd-display-Check-we-got-a-stream-in-update_info.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/0176-drm-amd-display-Check-we-got-a-stream-in-update_info.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0176-drm-amd-display-Check-we-got-a-stream-in-update_info.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0176-drm-amd-display-Check-we-got-a-stream-in-update_info.patch
new file mode 100644
index 00000000..736862d0
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0176-drm-amd-display-Check-we-got-a-stream-in-update_info.patch
@@ -0,0 +1,33 @@
+From 496077f56d976bb375b3cc7e208049830e51e026 Mon Sep 17 00:00:00 2001
+From: Hersen Wu <hersenxs.wu@amd.com>
+Date: Fri, 20 Jan 2017 15:54:13 -0500
+Subject: [PATCH 0176/4131] drm/amd/display: Check we got a stream in
+ update_info_frame
+
+Signed-off-by: Hersen Wu <hersenxs.wu@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/dce110/dce110_hw_sequencer.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+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 6dbfc57..ce56f23 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
+@@ -837,6 +837,11 @@ static enum dc_status bios_parser_crtc_source_select(
+
+ void dce110_update_info_frame(struct pipe_ctx *pipe_ctx)
+ {
++ ASSERT(pipe_ctx->stream);
++
++ if (pipe_ctx->stream_enc == NULL)
++ return; /* this is not root pipe */
++
+ if (dc_is_hdmi_signal(pipe_ctx->stream->signal))
+ pipe_ctx->stream_enc->funcs->update_hdmi_info_packets(
+ pipe_ctx->stream_enc,
+--
+2.7.4
+