From: lingjie li <lingjie.li@amlogic.com>
Date: Tue, 19 Feb 2019 11:47:06 +0000 (+0800)
Subject: osd: update osd_count according to the chip [2/4]
X-Git-Tag: hardkernel-4.9.236-104~1645
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1142c9d5ac9a9fe63b2c1fab9b0cdd1c50d52c0;p=platform%2Fkernel%2Flinux-amlogic.git

osd: update osd_count according to the chip [2/4]

PD#SWPL-3996

Problem:
g12b/g12a wayland-drm device print below error
"fb: error osd index=0" while start wayland-client.
while start wayland-client.

Solution:
set to the proper osd_count

Verify:
W400

Change-Id: I3c4c6d821ff0778cd4912a67046f7dbab60be2ad
Signed-off-by: lingjie li <lingjie.li@amlogic.com>
---

diff --git a/drivers/amlogic/drm/am_meson_vpu.c b/drivers/amlogic/drm/am_meson_vpu.c
index fccfdc2..9c7850b 100644
--- a/drivers/amlogic/drm/am_meson_vpu.c
+++ b/drivers/amlogic/drm/am_meson_vpu.c
@@ -208,7 +208,7 @@ static struct osd_device_data_s osd_g12a = {
 	.cpu_id = __MESON_CPU_MAJOR_ID_G12A,
 	.osd_ver = OSD_HIGH_ONE,
 	.afbc_type = MALI_AFBC,
-	.osd_count = 3,
+	.osd_count = 4,
 	.has_deband = 1,
 	.has_lut = 1,
 	.has_rdma = 1,
@@ -223,7 +223,7 @@ static struct osd_device_data_s osd_g12b = {
 	.cpu_id = __MESON_CPU_MAJOR_ID_G12B,
 	.osd_ver = OSD_HIGH_ONE,
 	.afbc_type = MALI_AFBC,
-	.osd_count = 3,
+	.osd_count = 4,
 	.has_deband = 1,
 	.has_lut = 1,
 	.has_rdma = 1,
@@ -240,15 +240,22 @@ static struct page *logo_page;
 static struct delayed_work osd_dwork;
 static struct platform_device *gp_dev;
 
+
 int am_meson_crtc_dts_info_set(const void *dt_match_data)
 {
 	struct osd_device_data_s *osd_meson;
 
 	osd_meson = (struct osd_device_data_s *)dt_match_data;
-	if (osd_meson)
+	if (osd_meson) {
 		memcpy(&osd_meson_dev, osd_meson,
 			sizeof(struct osd_device_data_s));
-	else {
+		osd_meson_dev.viu1_osd_count = osd_meson_dev.osd_count;
+		if (osd_meson_dev.has_viu2) {
+			/* set viu1 osd count */
+			osd_meson_dev.viu1_osd_count--;
+			osd_meson_dev.viu2_index = osd_meson_dev.viu1_osd_count;
+		}
+	} else {
 		DRM_ERROR("%s data NOT match\n", __func__);
 		return -1;
 	}