iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: rcar-du: 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>
This commit is contained in:
Laurent Pinchart 2015-05-27 02:14:37 +03:00 committed by Laurent Pinchart
parent 898a2f387d
commit 39a3d57065
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/rcar-du/rcar_du_kms.c
View File

@ -495,8 +495,10 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
/* Allocate the commit object. */ /* Allocate the commit object. */
commit = kzalloc(sizeof(*commit), GFP_KERNEL); commit = kzalloc(sizeof(*commit), GFP_KERNEL);
if (commit == NULL) if (commit == NULL) {
return -ENOMEM; ret = -ENOMEM;
goto error;
}
INIT_WORK(&commit->work, rcar_du_atomic_work); INIT_WORK(&commit->work, rcar_du_atomic_work);
commit->dev = dev; commit->dev = dev;
@ -519,7 +521,7 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
if (ret) { if (ret) {
kfree(commit); kfree(commit);
return ret; goto error;
} }
/* Swap the state, this is the point of no return. */ /* Swap the state, this is the point of no return. */
@ -531,6 +533,10 @@ static int rcar_du_atomic_commit(struct drm_device *dev,
rcar_du_atomic_complete(commit); rcar_du_atomic_complete(commit);
return 0; return 0;
error:
drm_atomic_helper_cleanup_planes(dev, state);
return ret;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------