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

Merge "Revert "ODROID-COMMON: media/hdmitx: add "now" to attr to trigger set_disp_mode_auto()"" into odroidc4-4.9.y

Browse Source
This commit is contained in:
Dongjin Kim
2020-04-08 13:07:36 +09:00
committed by Gerrit Code Review
parent 3650222e43 8f53e1c6e8
commit e8cdad3a23
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
View File

@@ -465,9 +465,6 @@ static int set_disp_mode_auto(void)
/* vic_ready got from IP */
enum hdmi_vic vic_ready = hdev->hwop.getstate(
hdev, STAT_VIDEO_VIC, 0);
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
char *now = strstr(hdmitx_device.fmt_attr, "now");
#endif
memset(mode, 0, sizeof(mode));
hdev->ready = 0;
@@ -555,12 +552,6 @@ static int set_disp_mode_auto(void)
else {
/* nothing */
}
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
if (!now)
vic_ready = vic;
#endif
if ((vic_ready != HDMI_Unknown) && (vic_ready == vic)) {
pr_info(SYS "[%s] ALREADY init VIC = %d\n",
__func__, vic);
@@ -598,11 +589,6 @@ static int set_disp_mode_auto(void)
hdmitx_pre_display_init();
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
if (now)
memset(now, ' ', 3);
#endif
hdev->cur_VIC = HDMI_Unknown;
/* if vic is HDMI_Unknown, hdmitx_set_display will disable HDMI */
ret = hdmitx_set_display(hdev, vic);
@@ -683,12 +669,6 @@ ssize_t store_attr(struct device *dev,
hdmitx_device.para->cs = COLORSPACE_YUV420;
else
hdmitx_device.para->cs = COLORSPACE_YUV444;
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
if (strstr(hdmitx_device.fmt_attr, "now"))
set_disp_mode_auto();
#endif
return count;
}
/*aud_mode attr*/