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

hdmi:

Browse Source 
1. fix 3288 hdmi audio source select error.
	2. For mid, it need to call rk_fb_get_display_policy
	   to reset overscan after swichting vop timing.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-02-03 15:51:18 +08:00
parent ea38e66b9d
commit c4f332cc42
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
View File

@@ -161,16 +161,20 @@ int hdmi_set_lcdc(struct hdmi *hdmi)
if (hdmi->autoset)
hdmi->vic = hdmi_find_best_mode(hdmi, 0);
else
hdmi->vic = hdmi_find_best_mode(hdmi, hdmi->vic);
hdmi->vic = hdmi_find_best_mode(hdmi, hdmi->vic);
if (hdmi->vic == 0)
hdmi->vic = HDMI_VIDEO_DEFAULT_MODE;
rc = hdmi_set_info(&screen, hdmi);
if (rc == 0)
if (rc == 0) {
rk_fb_switch_screen(&screen, 1, hdmi->lcdc->id);
if (rk_fb_get_display_policy() != DISPLAY_POLICY_BOX)
rk_fb_disp_scale(hdmi->xscale,
hdmi->yscale,
hdmi->lcdc->id);
}
return rc;
}

2
drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
View File

@@ -1483,7 +1483,7 @@ static int hdmi_dev_config_audio(struct hdmi *hdmi, struct hdmi_audio *audio)
m_AUD_PACK_LAYOUT,
v_AUD_PACK_LAYOUT((audio->channel > 2) ? 1 : 0));
if (hdmi_dev->audiosrc == HDMI_AUDIO_SRC_IIS) {
if (hdmi_dev->audiosrc == HDMI_AUDIO_SRC_SPDIF) {
hdmi_msk_reg(hdmi_dev, AUD_CONF0,
m_I2S_SEL, v_I2S_SEL(AUDIO_SPDIF_GPA));
hdmi_msk_reg(hdmi_dev, AUD_SPDIF1,