From: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Date: Mon, 31 Jul 2017 12:09:02 -0400
Subject: drm/amd/display: Fix comment placement for when new_stream is null
Git-commit: a7b06724eeb4ecca0c64e8f734e8ef27001670ca
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4603,6 +4603,13 @@ int amdgpu_dm_atomic_check(struct drm_de
 								    &crtc_state->mode,
 								    dm_conn_state);
 
+				/*
+				 * we can have no stream on ACTION_SET if a display
+				 * was disconnected during S3, in this case it not and
+				 * error, the OS will be updated after detection, and
+				 * do the right thing on next atomic commit
+				 */
+
 				if (!new_stream) {
 					DRM_DEBUG_KMS("%s: Failed to create new stream for crtc %d\n",
 							__func__, acrtc->base.base.id);
@@ -4615,14 +4622,6 @@ int amdgpu_dm_atomic_check(struct drm_de
 			if (modeset_required(crtc_state, new_stream,
 					     old_acrtc_state->stream)) {
 
-
-			/*
-			 * we can have no stream on ACTION_SET if a display
-			 * was disconnected during S3, in this case it not and
-			 * error, the OS will be updated after detection, and
-			 * do the right thing on next atomic commit
-			 */
-
 				if (new_acrtc_state->stream)
 					dc_stream_release(new_acrtc_state->stream);