diff options
| author | Laurent Pinchart | 2015-05-27 13:39:46 +0200 |
|---|---|---|
| committer | Rob Clark | 2015-06-11 19:11:05 +0200 |
| commit | f65c18c050b8386dbeec26e965bc018bb808cc88 (patch) | |
| tree | ca9680ffffd58baeee615dd79ad0ad63a20351ea /drivers/gpu/drm/msm/msm_atomic.c | |
| parent | drm/msm/mdp5: Always generate active-high sync signals for DSI (diff) | |
| download | kernel-qcow2-linux-f65c18c050b8386dbeec26e965bc018bb808cc88.tar.gz kernel-qcow2-linux-f65c18c050b8386dbeec26e965bc018bb808cc88.tar.xz kernel-qcow2-linux-f65c18c050b8386dbeec26e965bc018bb808cc88.zip | |
drm/msm/atomic: Clean up planes in the error paths of .atomic_commit()
When the .atomic_commit() handler fails, clean up planes previoulsy
prepared by drm_atomic_helper_prepare_planes() with a call to
drm_atomic_helper_cleanup_planes().
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_atomic.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 84c0a72b446b..b421c843c9df 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -213,8 +213,10 @@ int msm_atomic_commit(struct drm_device *dev, return ret; c = commit_init(state); - if (!c) - return -ENOMEM; + if (!c) { + ret = -ENOMEM; + goto error; + } /* * Figure out what crtcs we have: @@ -247,7 +249,7 @@ int msm_atomic_commit(struct drm_device *dev, ret = start_atomic(dev->dev_private, c->crtc_mask); if (ret) { kfree(c); - return ret; + goto error; } /* @@ -291,4 +293,8 @@ int msm_atomic_commit(struct drm_device *dev, complete_commit(c); return 0; + +error: + drm_atomic_helper_cleanup_planes(dev, state); + return ret; } |