From 8f53e1c6e87206910b6334084b44335174abf2f7 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Wed, 8 Apr 2020 13:07:29 +0900 Subject: [PATCH] Revert "ODROID-COMMON: media/hdmitx: add "now" to attr to trigger set_disp_mode_auto()" This reverts commit 2e65f010b521bae8c5f72996613f9e5bc5eee104. Change-Id: I71054b56d1a2ae3590d496afcbb1ba4847881181 --- .../vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 20 ------------------- 1 file changed, 20 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 72cbcbd8bd0c..f2b0eb748b9f 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 @@ -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*/