Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bc8ffbd authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

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



This reverts commit cd2d6c92.

Cc: Shirish S <shirish.s@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b2f3f592

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+0 −3
Original line number Diff line number Diff line
@@ -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;