Skip to content

Commit

Permalink
Revert "drm/amd/display: fix dereferencing possible ERR_PTR()"
Browse files Browse the repository at this point in the history
This reverts commit cd2d6c9.

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>
  • Loading branch information
Harry Wentland authored and Alex Deucher committed Apr 12, 2018
1 parent b2f3f59 commit 1bc8ffb
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1bc8ffb

Please sign in to comment.