]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amd/display: Fix comment placement for when new_stream is null
authorBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Mon, 31 Jul 2017 16:09:02 +0000 (12:09 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 22:16:15 +0000 (18:16 -0400)
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>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 0436261243ab68b35b707ff7375f5c473250fd8e..c89d6089f3c320813c15ef8b1408ebc63d9a4112 100644 (file)
@@ -4603,6 +4603,13 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
                                                                    &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_device *dev,
                        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);