Commit 8451b5ad authored by Andre Renaud's avatar Andre Renaud Committed by Greg Kroah-Hartman
Browse files

staging: omapdrm: Expose the OMAP Z-Order property through DRM 



Added support for zorder changes through DRM plane properties

Signed-off-by: default avatarAndre Renaud <andre@bluewatersys.com>
Signed-off-by: default avatarRob Clark <rob@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c810c61

drivers/staging/omapdrm/omap_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/omapdrm/omap_plane.c

+19 −0
Original line number Diff line number Diff line
@@ -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