From 07668a6e92bbf0bcda1e0f24ae8057f34e31ae12 Mon Sep 17 00:00:00 2001 From: Joy Cho Date: Fri, 4 Jan 2019 10:45:30 +0900 Subject: [PATCH] ODROID-COMMON: vout: set default vout mode as HDMI always initialized Change-Id: Id9adb4d3adbf95d61eb34ce9097a01738f54cb63 Signed-off-by: Dongjin Kim --- .../amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 3 +++ drivers/amlogic/media/vout/vout_serve/vout_serve.c | 9 +++++++++ 2 files changed, 12 insertions(+) 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 4975aee29604..e94c658f68d6 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 @@ -4257,6 +4257,9 @@ static void hdmitx_hpd_plugin_handler(struct work_struct *work) info = hdmitx_get_current_vinfo(); if (info && (info->mode == VMODE_HDMI)) hdmitx_set_audio(hdev, &(hdev->cur_audio_param)); +#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) + set_disp_mode_auto(); +#endif hdev->hpd_state = 1; hdmitx_notify_hpd(hdev->hpd_state); diff --git a/drivers/amlogic/media/vout/vout_serve/vout_serve.c b/drivers/amlogic/media/vout/vout_serve/vout_serve.c index d74a52566c59..9200417a642c 100644 --- a/drivers/amlogic/media/vout/vout_serve/vout_serve.c +++ b/drivers/amlogic/media/vout/vout_serve/vout_serve.c @@ -894,7 +894,16 @@ static int refresh_tvout_mode(void) if (tvout_monitor_flag == 0) return 0; +#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) + /* + * vout mode is treated as HDMI always initialized + * even though HDMI cable is detached. + * TODO : except cvbs cable is plugged in. + */ + hpd_state = 1; +#else hpd_state = vout_get_hpd_state(); +#endif if (hpd_state) { /* Vout will check the checksum of EDID of uboot and kernel. * If checksum is different. Vout will set null to display/mode.