From: Yongqiang Sun <yongqiang.sun@amd.com>
Date: Wed, 21 Dec 2016 16:16:48 +0000 (-0500)
Subject: drm/amd/display: don't crash if stream is NULL when trying to share clocks
X-Git-Tag: v4.15-rc1~56^2~23^2~824
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f4e66cd7dac538adca4b1cac8f36b90db1709e6;p=thirdparty%2Fkernel%2Flinux.git

drm/amd/display: don't crash if stream is NULL when trying to share clocks

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 343114b2680f3..eac597d0c7905 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -288,6 +288,11 @@ static bool is_sharable_clk_src(
 	if (pipe_with_clk_src->clock_source == NULL)
 		return false;
 
+	if (pipe_with_clk_src->stream == NULL) {
+		ASSERT(0);
+		return false;
+	}
+
 	if (pipe_with_clk_src->stream->signal == SIGNAL_TYPE_VIRTUAL)
 		return false;