---

yaml
---
r: 324528
b: refs/heads/master
c: 8451b5a
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c810c613a9d61eb70735cfb85fe5db6e0331bae
+refs/heads/master: 8451b5adae5ca9b5f022cfdd029b7a5b5283f2ce

trunk/drivers/staging/omapdrm/omap_drv.h

@@ -62,6 +62,7 @@ struct omap_drm_private {
 
 	/* properties: */
 	struct drm_property *rotation_prop;
+	struct drm_property *zorder_prop;
 };
 
 /* this should probably be in drm-core to standardize amongst drivers */

trunk/drivers/staging/omapdrm/omap_plane.c

@@ -433,6 +433,15 @@ void omap_plane_install_properties(struct drm_plane *plane,
 		priv->rotation_prop = prop;
 	}
 	drm_object_attach_property(obj, prop, 0);
+
+        prop = priv->zorder_prop;
+        if (!prop) {
+		prop = drm_property_create_range(dev, 0, "zorder", 0, 3);
+		if (prop == NULL)
+			return;
+		priv->zorder_prop = prop;
+	}
+	drm_object_attach_property(obj, prop, 0);
 }
 
 int omap_plane_set_property(struct drm_plane *plane,
@@ -448,6 +457,16 @@ int omap_plane_set_property(struct drm_plane *plane,
 		DBG("%s: rotation: %02x", ovl->name, (uint32_t)val);
 		omap_plane->win.rotation = val;
 
+		if (ovl->is_enabled(ovl))
+			ret = omap_plane_dpms(plane, DRM_MODE_DPMS_ON);
+		else
+			ret = 0;
+	} else if (property == priv->zorder_prop) {
+		struct omap_overlay *ovl = omap_plane->ovl;
+
+		DBG("%s: zorder: %d", ovl->name, (uint32_t)val);
+		omap_plane->info.zorder = val;
+
 		if (ovl->is_enabled(ovl))
 			ret = omap_plane_dpms(plane, DRM_MODE_DPMS_ON);
 		else