From: Shirish S <shirish.s@amd.com>
Date: Mon, 8 Nov 2021 13:51:46 +0000 (+0530)
Subject: drm/amd/display: fix exit from amdgpu_dm_atomic_check() abruptly
X-Git-Tag: howlett/maple/20220722_2~1839^2~2^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=706bc8c501405aa78e71a646f8cf1e70de1f9485;p=users%2Fjedix%2Flinux-maple.git

drm/amd/display: fix exit from amdgpu_dm_atomic_check() abruptly

make action upon failure in "drm_atomic_add_affected_connectors()"
consistent with the rest of failures in amdgpu_dm_atomic_check().

Signed-off-by: Shirish S <shirish.s@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 94d225931d51..c1bbed7339fe 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -10802,7 +10802,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
 
 		ret = drm_atomic_add_affected_connectors(state, crtc);
 		if (ret)
-			return ret;
+			goto fail;
 
 		ret = drm_atomic_add_affected_planes(state, crtc);
 		if (ret)