diff options
author | Harry Wentland <harry.wentland@amd.com> | 2018-04-12 10:51:51 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-04-12 14:58:24 -0400 |
commit | 1bc8ffbd71380661c5bc9cd65649bb0cf3d0cf09 (patch) | |
tree | 37b4cb7bbee0c5752a663dede0860ccbe0d1a9db | |
parent | b2f3f5920ddb5b121cbc57ee9efc0c1ffe4d19af (diff) |
Revert "drm/amd/display: fix dereferencing possible ERR_PTR()"
This reverts commit cd2d6c92a8e39d7e50a5af9fcc67d07e6a89e91d.
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>
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 |
1 files changed, 0 insertions, 3 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 54bf0b39c38b..2edababd352d 100644 --- 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, | |||
4864 | return -EDEADLK; | 4864 | return -EDEADLK; |
4865 | 4865 | ||
4866 | crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc); | 4866 | crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc); |
4867 | if (IS_ERR(crtc_state)) | ||
4868 | return PTR_ERR(crtc_state); | ||
4869 | |||
4870 | if (crtc->primary == plane && crtc_state->active) { | 4867 | if (crtc->primary == plane && crtc_state->active) { |
4871 | if (!plane_state->fb) | 4868 | if (!plane_state->fb) |
4872 | return -EINVAL; | 4869 | return -EINVAL; |