diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-01-12 22:56:57 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-03-20 13:30:18 +0100 |
| commit | 82e58855bc4f8442145cb2037e164a4b1f5cf854 (patch) | |
| tree | 18e0e75c8902e6e45ff21d96608c109009629cd6 /drivers/gpu/drm/omapdrm/omap_plane.c | |
| parent | drm: omapdrm: Rename omap_plane_dpms() to omap_plane_set_enable() (diff) | |
| download | linux-82e58855bc4f8442145cb2037e164a4b1f5cf854.tar.xz linux-82e58855bc4f8442145cb2037e164a4b1f5cf854.zip | |
drm: omapdrm: Reset the zorder property when disabling a plane
Whether to reset plane properties at disable time isn't well-defined in
DRM, but resetting only part of them is probably as bad as it can get.
Make the behaviour coherent by resetting the zorder property in addition
to the rotation property.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_plane.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_plane.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c index 34f5cca5a6c5..efec4265c2ae 100644 --- a/drivers/gpu/drm/omapdrm/omap_plane.c +++ b/drivers/gpu/drm/omapdrm/omap_plane.c @@ -259,6 +259,9 @@ static int omap_plane_disable(struct drm_plane *plane) struct omap_plane *omap_plane = to_omap_plane(plane); omap_plane->win.rotation = BIT(DRM_ROTATE_0); + omap_plane->info.zorder = plane->type == DRM_PLANE_TYPE_PRIMARY + ? 0 : omap_plane->id; + return omap_plane_set_enable(plane, false); } |