From: sky zhou <sky.zhou@amlogic.com>
Date: Tue, 18 Sep 2018 11:12:34 +0000 (+0800)
Subject: osd: add new osd capacity. [1/1]
X-Git-Tag: khadas-vims-v0.9.6-release~1258
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cf227908364158f390dd640140011eae1bc48f7;p=platform%2Fkernel%2Flinux-amlogic.git

osd: add new osd capacity. [1/1]

PD#163001

Problem:
need update osd capacity for hwc modified

Solution:
osd: add new osd capacity.

Verify:
verified in u200 board1

Change-Id: I3d5f457b8d7277214d68c5d4c90c3484e8ccd4fa
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
---

diff --git a/drivers/amlogic/media/osd/osd.h b/drivers/amlogic/media/osd/osd.h
index 805b05a..57004bf 100644
--- a/drivers/amlogic/media/osd/osd.h
+++ b/drivers/amlogic/media/osd/osd.h
@@ -148,10 +148,10 @@ enum color_index_e {
 #define MALI_AFBC_SPLIT_OFF  0
 #define MALI_AFBC_SPLIT_ON   1
 #define OSD_HW_CURSOR           (1 << 0)
-#define OSD_VIDEO_CONFLICT      (1 << 1)
-#define OSD_FREESCALE           (1 << 2)
-#define OSD_UBOOT_LOGO          (1 << 3)
-#define OSD_ZORDER              (1 << 4)
+#define OSD_UBOOT_LOGO          (1 << 1)
+#define OSD_ZORDER			(1 << 2)
+#define OSD_PRIMARY		(1 << 3)
+#define OSD_FREESCALE		(1 << 4)
 #define OSD_VIU2                (1 << 29)
 #define OSD_VIU1                (1 << 30)
 #define OSD_LAYER_ENABLE        (1 << 31)
diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c
index aacaa85..9139c6bc 100644
--- a/drivers/amlogic/media/osd/osd_hw.c
+++ b/drivers/amlogic/media/osd/osd_hw.c
@@ -3286,10 +3286,10 @@ int osd_get_capbility(u32 index)
 	if (osd_hw.osd_meson_dev.osd_ver == OSD_HIGH_ONE) {
 		if (index == OSD1)
 			capbility |= OSD_LAYER_ENABLE | OSD_FREESCALE
-				| OSD_UBOOT_LOGO | OSD_ZORDER | OSD_VIU1;
+				| OSD_UBOOT_LOGO | OSD_ZORDER | OSD_VIU1
+				| OSD_PRIMARY;
 		else if ((index == OSD2) || (index == OSD3))
-			capbility |= OSD_LAYER_ENABLE |
-				OSD_VIDEO_CONFLICT | OSD_FREESCALE |
+			capbility |= OSD_LAYER_ENABLE | OSD_FREESCALE |
 				OSD_ZORDER | OSD_VIU1;
 		else if (index == OSD4)
 			capbility |= OSD_LAYER_ENABLE | OSD_VIU2;