| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2019-03-25 09:52:11 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2019-03-25 09:52:11 (GMT) |
| commit | bd011bb30410c2194da85b12440ff741ea42a697 (patch) | |
| tree | 3988f59cbe5346d0e2695449a25be1603e8c9bda | |
| parent | 0836dee324063da0e08b2d9ccfdecc9d62375356 (diff) | |
| parent | 78db0bf7537bd276dab1136594ddf4a3ada8414d (diff) | |
| download | common-bd011bb30410c2194da85b12440ff741ea42a697.zip common-bd011bb30410c2194da85b12440ff741ea42a697.tar.gz common-bd011bb30410c2194da85b12440ff741ea42a697.tar.bz2 | |
Merge "hdmitx:change color deep to 8 bit[1/1]" into p-tv-atom
| -rw-r--r-- | drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c index 14df3cf..3467cd6 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c @@ -1915,16 +1915,9 @@ static ssize_t show_dc_cap(struct device *dev, int pos = 0; struct rx_cap *pRXCap = &(hdmitx_device.RXCap); -#if 0 - if (pRXCap->dc_48bit_420) - pos += snprintf(buf + pos, PAGE_SIZE, "420,16bit\n"); -#endif - if (pRXCap->dc_36bit_420) - pos += snprintf(buf + pos, PAGE_SIZE, "420,12bit\n"); - if (pRXCap->dc_30bit_420) { - pos += snprintf(buf + pos, PAGE_SIZE, "420,10bit\n"); + if (pRXCap->dc_30bit_420) pos += snprintf(buf + pos, PAGE_SIZE, "420,8bit\n"); - } else { + else { vic = hdmitx_edid_get_VIC(&hdmitx_device, "2160p60hz420", 0); if (vic != HDMI_Unknown) { pos += snprintf(buf + pos, PAGE_SIZE, "420,8bit\n"); @@ -1948,20 +1941,9 @@ static ssize_t show_dc_cap(struct device *dev, } next444: if (pRXCap->dc_y444) { - if (pRXCap->dc_36bit) - pos += snprintf(buf + pos, PAGE_SIZE, "444,12bit\n"); - if (pRXCap->dc_30bit) { - pos += snprintf(buf + pos, PAGE_SIZE, "444,10bit\n"); + if (pRXCap->dc_30bit) pos += snprintf(buf + pos, PAGE_SIZE, "444,8bit\n"); - } -#if 0 - if (pRXCap->dc_48bit) - pos += snprintf(buf + pos, PAGE_SIZE, "444,16bit\n"); -#endif - if (pRXCap->dc_36bit) - pos += snprintf(buf + pos, PAGE_SIZE, "422,12bit\n"); if (pRXCap->dc_30bit) { - pos += snprintf(buf + pos, PAGE_SIZE, "422,10bit\n"); pos += snprintf(buf + pos, PAGE_SIZE, "422,8bit\n"); goto nextrgb; } @@ -1972,14 +1954,6 @@ next444: pos += snprintf(buf + pos, PAGE_SIZE, "422,8bit\n"); } nextrgb: -#if 0 - if (pRXCap->dc_48bit) - pos += snprintf(buf + pos, PAGE_SIZE, "rgb,16bit\n"); -#endif - if (pRXCap->dc_36bit) - pos += snprintf(buf + pos, PAGE_SIZE, "rgb,12bit\n"); - if (pRXCap->dc_30bit) - pos += snprintf(buf + pos, PAGE_SIZE, "rgb,10bit\n"); pos += snprintf(buf + pos, PAGE_SIZE, "rgb,8bit\n"); return pos; } |