commit eb715763665b49c83bc85b74dc12a3701416dba8
author jinbing.zhu <jinbing.zhu@amlogic.com> Fri Sep 27 11:38:51 2024 +0000
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Mon Sep 30 21:05:15 2024 -0700
tree 94ec6c42da05d09e9412022f595bc1a6eb6daeea
parent 42d089d5c058e6594bf7855a2b19d50bff15512b

uboot: t6d vpp configure. [1/1]

PD#SWPL-185299

Problem:
t6d vpp configure

Solution:
t6d vpp configure

Verify:
t6d

Change-Id: I77cbb5f80ea71b20aa3ecdbc5f79663a9ee923fe
Signed-off-by: jinbing.zhu <jinbing.zhu@amlogic.com>

drivers/amlogic/media/common/vpp/vpp.c

diff --git a/drivers/amlogic/media/common/vpp/vpp.c b/drivers/amlogic/media/common/vpp/vpp.c
index f26bf3e..d5ecbe4 100644
--- a/drivers/amlogic/media/common/vpp/vpp.c
+++ b/drivers/amlogic/media/common/vpp/vpp.c
@@ -1877,6 +1877,8 @@
 void vpp_enable_lcd_gamma_table(int index)
 {
 	unsigned int reg;
+	if (get_cpu_id().family_id == MESON_CPU_MAJOR_ID_T6D)
+		return;
 
 	if (get_cpu_id().family_id >= MESON_CPU_MAJOR_ID_T7) {
 		switch (index) {
@@ -1901,6 +1903,8 @@
 void vpp_disable_lcd_gamma_table(int index)
 {
 	unsigned int reg;
+	if (get_cpu_id().family_id == MESON_CPU_MAJOR_ID_T6D)
+		return;
 
 	if (get_cpu_id().family_id >= MESON_CPU_MAJOR_ID_T7) {
 		switch (index) {
@@ -1927,6 +1931,8 @@
 	unsigned int reg_encl_en, reg_cntl_port, reg_data_port, reg_addr_port;
 	int i;
 	int cnt = 0;
+	if (get_cpu_id().family_id == MESON_CPU_MAJOR_ID_T6D)
+		return;
 
 	if (get_cpu_id().family_id >= MESON_CPU_MAJOR_ID_T7) {
 		switch (index) {
@@ -2017,6 +2023,8 @@
 void vpp_init_lcd_gamma_table(int index)
 {
 	VPP_PR("%s\n", __func__);
+	if (get_cpu_id().family_id == MESON_CPU_MAJOR_ID_T6D)
+		return;
 
 	vpp_disable_lcd_gamma_table(index);
 
@@ -2109,10 +2117,11 @@
 	unsigned int data32;
 
 	data32 = vpp_reg_read(VPP_OFIFO_SIZE);
-	if (get_cpu_id().family_id == MESON_CPU_MAJOR_ID_S1A)
-		data32 |= 0x7ff;
+	if (get_cpu_id().family_id == MESON_CPU_MAJOR_ID_S1A ||
+		get_cpu_id().family_id == MESON_CPU_MAJOR_ID_T6D)
+		data32 |= (0x7ff + 1);
 	else
-		data32 |= 0xfff;
+		data32 |= (0xfff + 1);
 	vpp_reg_write(VPP_OFIFO_SIZE, data32);
 
 	data32 = 0x08080808;