hdmi: rk3288: No need to enable scrambling again in uboot mode

If scrambling mode is enabled in uboot and set again in kernel,
picture will flicker serveral frame.

Change-Id: Ib8fe0b1e2ce2a74eb10fcfbb6c8eb872452cfd20
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Reviewed-on: https://10.10.10.29/30
Tested-by: Huang, Tao <huangtao@rock-chips.com>
Reviewed-by: Huang, Tao <huangtao@rock-chips.com>

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 5d8cec28558216348738ec45589a515d342a9716..1d1ee3c0da7b804360d3a6888f3bc9e53040ca72 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
@@ -589,7 +589,7 @@ static int rockchip_hdmiv2_video_framecomposer(struct hdmi *hdmi_drv,
        /* Start/stop HDCP keepout window generation */
        hdmi_msk_reg(hdmi_dev, FC_INVIDCONF,
                     m_FC_HDCP_KEEPOUT, v_FC_HDCP_KEEPOUT(1));
-       if (hdmi_drv->edid.scdc_present == 1) {
+       if (hdmi_drv->edid.scdc_present == 1 && !hdmi_drv->uboot) {
                if (tmdsclk > 340000000 ||
                    hdmi_drv->edid.lte_340mcsc_scramble) {
                        /* used for HDMI 2.0 TX */