evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm: omapdrm: if omap_plane_atomic_update fails, disable plane

Browse source 
omap_plane_atomic_update() calls dispc_ovl_setup(), which can fail (but
shouldn't). To make the code a bit more robust, make sure the plane gets
disabled if dispc_ovl_setup() fails, as otherwise we might get illegal
HW configuration leading to error interrupts.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen 2015-05-29 11:06:07 +03:00 • committed by Laurent Pinchart
parent 11ffd031e3
commit 794a65ffba
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/omapdrm/omap_plane.c
View file

@ -132,8 +132,10 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
/* and finally, update omapdss: */ /* and finally, update omapdss: */
ret = dispc_ovl_setup(omap_plane->id, &info, false, ret = dispc_ovl_setup(omap_plane->id, &info, false,
omap_crtc_timings(state->crtc), false); omap_crtc_timings(state->crtc), false);
if (WARN_ON(ret)) if (WARN_ON(ret)) {
dispc_ovl_enable(omap_plane->id, false);
return; return;
}
dispc_ovl_enable(omap_plane->id, true); dispc_ovl_enable(omap_plane->id, true);
} }