amlogic: drm: support zpos update

Add to support zpos property update.

Change-Id: I854c644673b46fbf4f620ce1249e57b7206d6fce
Signed-off-by: Sihyun, Park <shwan.park@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/amlogic/drm/meson_plane.c b/drivers/amlogic/drm/meson_plane.c
index 855e190..78ea0da 100644 (file)
--- a/drivers/amlogic/drm/meson_plane.c
+++ b/drivers/amlogic/drm/meson_plane.c
@@ -487,7 +487,7 @@ static struct am_osd_plane *am_plane_create(struct meson_drm *priv, int i)
 {
        struct am_osd_plane *osd_plane;
        struct drm_plane *plane;
-       u32 type = 0;
+       u32 type = 0, zpos;
        char plane_name[8];
        const u64 *format_modifiers = afbc_wb_modifier;
 
@@ -506,6 +506,8 @@ static struct am_osd_plane *am_plane_create(struct meson_drm *priv, int i)
        osd_plane->drv = priv;
        osd_plane->plane_index = i;
 
+       zpos = osd_plane->plane_index;
+
        plane = &osd_plane->base;
        sprintf(plane_name, "osd%d", i);
 
@@ -517,6 +519,9 @@ static struct am_osd_plane *am_plane_create(struct meson_drm *priv, int i)
                                 type, plane_name);
 
        drm_plane_create_premult_en_property(plane);
+       drm_plane_create_zpos_property(plane, zpos,
+                                      MESON_PLANE_BEGIN_ZORDER,
+                                      MESON_PLANE_END_ZORDER);
        drm_plane_helper_add(plane, &am_osd_helper_funcs);
        osd_drm_debugfs_add(&osd_plane->plane_debugfs_dir,
                            plane_name, osd_plane->plane_index);

diff --git a/drivers/amlogic/drm/meson_plane.h b/drivers/amlogic/drm/meson_plane.h
index 5be8adc..63e2709 100644 (file)
--- a/drivers/amlogic/drm/meson_plane.h
+++ b/drivers/amlogic/drm/meson_plane.h
@@ -29,6 +29,9 @@
 #include "osd_drm.h"
 #include "meson_fb.h"
 
+#define MESON_PLANE_BEGIN_ZORDER       1
+#define MESON_PLANE_END_ZORDER         65
+
 struct am_meson_plane_state {
        struct drm_plane_state base;
        u32 premult_en;