diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-16 13:58:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-16 13:58:27 +1000 |
| commit | 925344ccc91d7a7fd84cab2dece1c34bbd86fd8c (patch) | |
| tree | bd4110dc5a3b70a5674b9d6d5340cc1889f5d6e8 /drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | |
| parent | a6821698918a579e7219d706092e83f367f01ba2 (diff) | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
| download | op-kernel-dev-925344ccc91d7a7fd84cab2dece1c34bbd86fd8c.zip op-kernel-dev-925344ccc91d7a7fd84cab2dece1c34bbd86fd8c.tar.gz | |
BackMerge tag 'v4.12-rc5' into drm-next
Linux 4.12-rc5 for nouveau fixes
Diffstat (limited to 'drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index 5e7d9af..abaaac7 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c @@ -225,9 +225,10 @@ mdp5_plane_duplicate_state(struct drm_plane *plane) mdp5_state = kmemdup(to_mdp5_plane_state(plane->state), sizeof(*mdp5_state), GFP_KERNEL); + if (!mdp5_state) + return NULL; - if (mdp5_state && mdp5_state->base.fb) - drm_framebuffer_reference(mdp5_state->base.fb); + __drm_atomic_helper_plane_duplicate_state(plane, &mdp5_state->base); return &mdp5_state->base; } @@ -444,6 +445,10 @@ static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state, mdp5_pipe_release(state->state, old_hwpipe); mdp5_pipe_release(state->state, old_right_hwpipe); } + } else { + mdp5_pipe_release(state->state, mdp5_state->hwpipe); + mdp5_pipe_release(state->state, mdp5_state->r_hwpipe); + mdp5_state->hwpipe = mdp5_state->r_hwpipe = NULL; } return 0; |
