ODROID-C2: Fix abnormal detection issue of 480i60hz and 576i50hz

Change-Id: Idb1aab35c4aaa2bbf8c6e2b5d6691c91c4b6d1a5
hardkernel · Apr 7, 2017 · 750e9e1 · 750e9e1
1 parent 0099bd0
commit 750e9e1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/drivers/amlogic/clk/gxbb_hdmi_clk.c b/drivers/amlogic/clk/gxbb_hdmi_clk.c
@@ -881,7 +881,8 @@ static struct cts_encx_table cts_encp_tbl[] = {
 
 static struct cts_encx_table cts_enci_tbl[] = {
 	CTS_XXX_TBL(54000, 432000, 4, 2),
-	CTS_XXX_TBL(27000, 432000, 4, 1),
+	CTS_XXX_TBL(27000, 54000, 1, 2),
+	CTS_XXX_TBL(27000, 216000, 4, 2),
 };
 static struct cts_encx_table cts_pixel_tbl[] = {
 	CTS_XXX_TBL(594000, 594000, 1, 1),

diff --git a/drivers/amlogic/hdmi/hdmi_tx_20/hw/enc_cfg_hw.c b/drivers/amlogic/hdmi/hdmi_tx_20/hw/enc_cfg_hw.c
@@ -134,9 +134,13 @@ static const struct reg_s tvregs_480i[] = {
 	{P_ENCI_SYNC_MODE, 0x07},
 	{P_ENCI_DBG_PX_RST, 0},
 	{P_ENCI_VFIFO2VD_CTL, 0x4e01},
-	{P_VPU_VIU_VENC_MUX_CTRL, 0x0005},
-	{P_ENCI_DACSEL_0, 0x0011},
-	{P_ENCI_DACSEL_1, 0x87},
+	{P_VPU_VIU_VENC_MUX_CTRL, 0x5},
+	{P_ENCI_VFIFO2VD_PIXEL_START, 0xf3,},
+	{P_ENCI_VFIFO2VD_PIXEL_END, 0x0693,},
+	{P_ENCI_VFIFO2VD_LINE_TOP_START, 0x12,},
+	{P_ENCI_VFIFO2VD_LINE_TOP_END, 0x102,},
+	{P_ENCI_VFIFO2VD_LINE_BOT_START, 0x13,},
+	{P_ENCI_VFIFO2VD_LINE_BOT_END, 0x103,},
 	{P_ENCP_VIDEO_EN, 0},
 	{P_ENCI_VIDEO_EN, 1},
 	{MREG_END_MARKER, 0},
@@ -205,9 +209,14 @@ static const struct reg_s tvregs_576i[] = {
 	{P_ENCI_VFIFO2VD_LINE_BOT_START, 0x0017},
 	{P_ENCI_VFIFO2VD_LINE_BOT_END, 0x0137},
 	{P_ENCI_DBG_PX_RST, 0},
-	{P_VPU_VIU_VENC_MUX_CTRL, 0x0005},
-	{P_ENCI_DACSEL_0, 0x0011},
-	{P_ENCI_DACSEL_1, 0x87},
+	{P_ENCI_VFIFO2VD_CTL, 0x4e01},
+	{P_VPU_VIU_VENC_MUX_CTRL, 0x5},
+	{P_ENCI_VFIFO2VD_PIXEL_START, 0x010b},
+	{P_ENCI_VFIFO2VD_PIXEL_END, 0x06ab},
+	{P_ENCI_VFIFO2VD_LINE_TOP_START, 0x0016},
+	{P_ENCI_VFIFO2VD_LINE_TOP_END, 0x0136},
+	{P_ENCI_VFIFO2VD_LINE_BOT_START, 0x0017},
+	{P_ENCI_VFIFO2VD_LINE_BOT_END, 0x0137},
 	{P_ENCP_VIDEO_EN, 0},
 	{P_ENCI_VIDEO_EN, 1},
 	{MREG_END_MARKER, 0},

diff --git a/drivers/amlogic/hdmi/hdmi_tx_20/hw/hdmi_tx_hw.c b/drivers/amlogic/hdmi/hdmi_tx_20/hw/hdmi_tx_hw.c
@@ -325,9 +325,9 @@ static struct hdmitx_clk hdmitx_clk[] = {
 	{HDMI_1280x720p60_16x9, 24000, 742500, 148500, 148500, -1, 74250},
 	{HDMI_1280x720p50_16x9, 24000, 742500, 148500, 148500, -1, 74250},
 	{HDMI_720x576p50_16x9, 24000, 270000, 54000, 54000, -1, 27000},
-	{HDMI_720x576i50_16x9, 24000, 270000, 54000, -1, 54000, 27000},
+	{HDMI_720x576i50_16x9, 24000, 270000, 54000, -1, 27000, 27000},
 	{HDMI_720x480p60_16x9, 24000, 270000, 54000, 54000, -1, 27000},
-	{HDMI_720x480i60_16x9, 24000, 270000, 54000, -1, 54000, 27000},
+	{HDMI_720x480i60_16x9, 24000, 270000, 54000, -1, 27000, 27000},
 	{HDMI_3840x2160p24_16x9, 24000, 2970000, 297000, 297000, -1, 297000},
 	{HDMI_3840x2160p25_16x9, 24000, 2970000, 297000, 297000, -1, 297000},
 	{HDMI_3840x2160p30_16x9, 24000, 2970000, 297000, 297000, -1, 297000},