From 35945cc8e5661e23701ee5ddf414296f363b5570 Mon Sep 17 00:00:00 2001 From: "Sihyun, Park" Date: Mon, 31 May 2021 19:19:37 +0900 Subject: [PATCH] amlogic: drm: support zpos update Add to support zpos property update. Change-Id: I854c644673b46fbf4f620ce1249e57b7206d6fce Signed-off-by: Sihyun, Park Signed-off-by: Seung-Woo Kim --- drivers/amlogic/drm/meson_plane.c | 7 ++++++- drivers/amlogic/drm/meson_plane.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/drm/meson_plane.c b/drivers/amlogic/drm/meson_plane.c index 855e1905a488..78ea0dab2174 100644 --- 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 5be8adc5dab0..63e27099e945 100644 --- 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; -- 2.34.1