drm/meson: Add zpos immutable property to planes

Add immutable zpos property to primary and overlay planes to specify
the current fixed zpos position.

Fixes: f9a2348196d1 ("drm/meson: Support Overlay plane for video rendering")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190429075247.7946-1-narmstrong@baylibre.com

diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c
index 55b3f2f2e608184129708fcf054a79341732e2ee..cc7c6ae3013d736ea67b519324264d59e2de41c9 100644 (file)
--- a/drivers/gpu/drm/meson/meson_overlay.c
+++ b/drivers/gpu/drm/meson/meson_overlay.c
@@ -578,6 +578,9 @@ int meson_overlay_create(struct meson_drm *priv)
 
        drm_plane_helper_add(plane, &meson_overlay_helper_funcs);
 
+       /* For now, VD Overlay plane is always on the back */
+       drm_plane_create_zpos_immutable_property(plane, 0);
+
        priv->overlay_plane = plane;
 
        DRM_DEBUG_DRIVER("\n");

diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index 22490047932ec11a7f199cf653100a11b21d56b1..97fdf6b4600c7adc60d0d4130564b23f3654c257 100644 (file)
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -371,6 +371,9 @@ int meson_plane_create(struct meson_drm *priv)
 
        drm_plane_helper_add(plane, &meson_plane_helper_funcs);
 
+       /* For now, OSD Primary plane is always on the front */
+       drm_plane_create_zpos_immutable_property(plane, 1);
+
        priv->primary_plane = plane;
 
        return 0;