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

Merge "ODROID-N2: vout: set default vout mode as HDMI always initialized" into odroidn2-4.9.y

Browse Source
This commit is contained in:
Mauro Ribeiro
2019-01-09 09:07:52 +09:00
committed by Gerrit Code Review
parent 3736b86e06 9c24c05ba1
commit 73d89d02cb
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3783,6 +3783,7 @@ static void hdmitx_hpd_plugin_handler(struct work_struct *work)
rx_set_receive_hdcp(bksv_buf, 1, 1, 0, 0);
}
set_disp_mode_auto();
hdmitx_set_audio(hdev, &(hdev->cur_audio_param));
hdev->hpd_state = 1;
hdmitx_notify_hpd(hdev->hpd_state);

9
drivers/amlogic/media/vout/vout_serve/vout_serve.c
View File

@@ -854,7 +854,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) {
cur_vmode = validate_vmode(hdmimode);
snprintf(cur_mode_str, VMODE_NAME_LEN_MAX, "%s", hdmimode);