drm/amd/display: Check we got a stream in update_info_frame
authorHersen Wu <hersenxs.wu@amd.com>
Fri, 20 Jan 2017 20:54:13 +0000 (15:54 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 21:12:07 +0000 (17:12 -0400)
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

index 6dbfc57..ce56f23 100644 (file)
@@ -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,