Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dff6c246 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm: omapdrm: Add zpos property 



Create a standard zpos property for every plane as an alias to the
omapdrm-specific zorder property. Unlike the zorder property that has to
be instantiated for both planes and CRTCs due to backward compatibility,
the zpos property is only instantiated for planes. When userspace will
have switched to the zpos property the zorder property will be removed.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent d980278b

drivers/gpu/drm/omapdrm/omap_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -178,8 +178,10 @@ static int omap_connect_dssdevs(void) 
static int omap_modeset_init_properties(struct drm_device *dev)

{

	struct omap_drm_private *priv = dev->dev_private;

	unsigned int num_planes = priv->dispc_ops->get_num_ovls();



	priv->zorder_prop = drm_property_create_range(dev, 0, "zorder", 0, 3);

	priv->zorder_prop = drm_property_create_range(dev, 0, "zorder", 0,

						      num_planes - 1);

	if (!priv->zorder_prop)

		return -ENOMEM;

drivers/gpu/drm/omapdrm/omap_plane.c

+2 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, 
		u32 possible_crtcs)

{

	struct omap_drm_private *priv = dev->dev_private;

	unsigned int num_planes = priv->dispc_ops->get_num_ovls();

	struct drm_plane *plane;

	struct omap_plane *omap_plane;

	enum omap_plane_id id;
@@ -324,6 +325,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, 
	drm_plane_helper_add(plane, &omap_plane_helper_funcs);



	omap_plane_install_properties(plane, &plane->base);

	drm_plane_create_zpos_property(plane, 0, 0, num_planes - 1);



	return plane;