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>

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 34f5cca..efec426 100644 (file)
--- 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);
 }