diff options
| author | Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> | 2017-07-31 12:09:02 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:16:15 -0400 |
| commit | a7b06724eeb4ecca0c64e8f734e8ef27001670ca (patch) | |
| tree | 717fcc8261d47113f70cda0932cf78068005f185 | |
| parent | 497de04ffe666c2f006ab318aa99cde25cc1176a (diff) | |
drm/amd/display: Fix comment placement for when new_stream is null
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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 |
1 files changed, 7 insertions, 8 deletions
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 0436261243ab..c89d6089f3c3 100644 --- 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_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); |