From: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Date: Fri, 6 Oct 2017 19:11:41 +0000 (-0400)
Subject: drm/amd/display: ASSERT on dc_create_state failing.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5771ec8fe8cb99c0db3115e81b4f69b1543c6982;p=openwrt%2Fstaging%2Fblogic.git

drm/amd/display: ASSERT on dc_create_state failing.

dc_create_state() returns NULL on allocation failure. Raise warning when
that happens.

Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index fad40da8422e..e439363ed54b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -702,6 +702,7 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev)
 	dc_release_state(cached_state->context);
 
 	cached_state->context = dc_create_state();
+	ASSERT(cached_state->context);
 	dc_resource_state_copy_construct_current(adev->dm.dc, cached_state->context);
 
 	for_each_new_crtc_in_state(adev->dm.cached_state, crtc, new_crtc_state, i) {