xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/msm/atomic: Clean up planes in the error paths of .atomic_commit()

Browse Source 
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>
This commit is contained in:
Laurent Pinchart
2015-05-27 14:39:46 +03:00
committed by Rob Clark
parent 1efb92a306
commit f65c18c050
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/msm/msm_atomic.c
View File

@@ -213,8 +213,10 @@ int msm_atomic_commit(struct drm_device *dev,
return ret; return ret;
c = commit_init(state); c = commit_init(state);
if (!c) if (!c) {
return -ENOMEM; ret = -ENOMEM;
goto error;
}
/* /*
* Figure out what crtcs we have: * 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); ret = start_atomic(dev->dev_private, c->crtc_mask);
if (ret) { if (ret) {
kfree(c); kfree(c);
return ret; goto error;
} }
/* /*
@@ -291,4 +293,8 @@ int msm_atomic_commit(struct drm_device *dev,
complete_commit(c); complete_commit(c);
return 0; return 0;
error:
drm_atomic_helper_cleanup_planes(dev, state);
return ret;
} }