Revert "drm/amd/display: fix dereferencing possible ERR_PTR()"

This reverts commit 8b5db9ecf3ea3d9fb3104f17bc96c26cce6e689d.

Cc: Shirish S <shirish.s@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-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 54bf0b39c38b0b90898b5cfd40761544db9d2076..2edababd352d5fba95ee16a31e3a3758a764807c 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4864,9 +4864,6 @@ static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state,
                        return -EDEADLK;
 
                crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc);
-               if (IS_ERR(crtc_state))
-                       return PTR_ERR(crtc_state);
-
                if (crtc->primary == plane && crtc_state->active) {
                        if (!plane_state->fb)
                                return -EINVAL;