summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHersen Wu <hersenxs.wu@amd.com>2017-01-20 15:54:13 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 17:12:07 -0400
commit86e2e1bee07134f712cb6b807b7f0205057bd11e (patch)
tree068b0e58d72dd0b8e95951ee853c5fa817f03ba8
parente4e354b02fa8b6d53ec65bd5dbd27d014e4e752f (diff)
downloadlinux-86e2e1bee07134f712cb6b807b7f0205057bd11e.tar.bz2
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>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c5
1 files changed, 5 insertions, 0 deletions
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 6dbfc570b8c6..ce56f23806bc 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,