hdmi:

	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>

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
index 26576eb4462388b5bf7df5a17beabc1b134cc35b..1bd26e7e7f4fdd9f16d4590d2571aa024077a7c0 100644 (file)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-lcdc.c
@@ -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;
 }
 

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
index 4636b28917465cb9fb8c8c598291611f446d30d5..b0295dd5f47c93e2a2217357ad168062e36ea14d 100644 (file)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
@@ -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,