shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

hdmitx: fix wrong color under 480i/576i, Y422 [1/1]

Browse Source 
PD#SWPL-31602

Problem:
Lack y422 setting for 480i/576i

Solution:
Add y422 setting for 480i/576i

Verify:
SM1/Newton

Change-Id: I3a1b766fc3e87dc70592cb3c3c4db8527ce9037d
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
This commit is contained in:
Zongdong Jiao
2020-08-21 16:18:05 +08:00
committed by Chris
parent f7c31b27d8
commit 2c8a794002
2 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
View File

@@ -2737,10 +2737,6 @@ bool hdmitx_edid_check_valid_mode(struct hdmitx_dev *hdev,
if (para->cd != COLORDEPTH_24B)
return 0;
break;
case HDMI_720x480i60_16x9:
case HDMI_720x576i50_16x9:
if (para->cs == COLORSPACE_YUV422)
return 0;
default:
break;
}

52
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c
View File

@@ -2312,6 +2312,8 @@ static void hdmitx_set_scdc(struct hdmitx_dev *hdev)
void hdmitx_set_enc_hw(struct hdmitx_dev *hdev)
{
unsigned int data32 = 0;
set_vmode_enc_hw(hdev);
if (hdev->flag_3dfp) {
@@ -2368,6 +2370,25 @@ void hdmitx_set_enc_hw(struct hdmitx_dev *hdev)
hd_set_reg_bits(P_VPU_HDMI_SETTING, 0, 4, 4);
}
switch (hdev->cur_video_param->VIC) {
case HDMI_480i60:
case HDMI_480i60_16x9:
case HDMI_576i50:
case HDMI_576i50_16x9:
case HDMI_480i60_16x9_rpt:
case HDMI_576i50_16x9_rpt:
data32 = (1 << 0) | /* 2b01: ENCI 2b10: ENCP */
(0 << 2) | /* INV_HSYNC */
(0 << 3) | /* INV_VSYNC */
(4 << 5) | /* 0 CrYCb/BGR 1 YCbCr/RGB 2 YCrCb/RBG.. */
(1 << 8) | /* WR_RATE */
(1 << 12); /* RD_RATE */
hd_write_reg(P_VPU_HDMI_SETTING, data32);
break;
default:
break;
}
switch (hdev->para->cd) {
case COLORDEPTH_30B:
case COLORDEPTH_36B:
@@ -2406,7 +2427,6 @@ void hdmitx_set_enc_hw(struct hdmitx_dev *hdev)
}
break;
}
switch (hdev->cur_video_param->VIC) {
case HDMI_480i60:
case HDMI_480i60_16x9:
@@ -5697,6 +5717,36 @@ static void config_hdmi20_tx(enum hdmi_vic vic,
vid_map = 0x12;
}
switch (para->vic) {
case HDMI_720x480i60_4x3:
case HDMI_720x480i60_16x9:
case HDMI_2880x480i60_4x3:
case HDMI_2880x480i60_16x9:
case HDMI_720x576i50_4x3:
case HDMI_720x576i50_16x9:
case HDMI_2880x576i50_4x3:
case HDMI_2880x576i50_16x9:
case HDMI_720x576i100_4x3:
case HDMI_720x576i100_16x9:
case HDMI_720x480i120_4x3:
case HDMI_720x480i120_16x9:
case HDMI_720x576i200_4x3:
case HDMI_720x576i200_16x9:
case HDMI_720x480i240_4x3:
case HDMI_720x480i240_16x9:
if (output_color_format == COLORSPACE_YUV422) {
if (color_depth == COLORDEPTH_24B)
vid_map = 0x09;
if (color_depth == COLORDEPTH_30B)
vid_map = 0x0b;
if (color_depth == COLORDEPTH_36B)
vid_map = 0x0d;
}
break;
default:
break;
}
data32 = 0;
data32 |= (0 << 7);
data32 |= (vid_map << 0);