From: Zheng Yang Date: Thu, 27 Aug 2015 01:02:17 +0000 (+0800) Subject: hdmi: rk3288: No need to enable scrambling again in uboot mode X-Git-Tag: firefly_0821_release~3822 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=effbcfa6c5d5773cb1a9f46b3d029992bcc77a00;p=firefly-linux-kernel-4.4.55.git 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 Reviewed-on: https://10.10.10.29/30 Tested-by: Huang, Tao Reviewed-by: Huang, Tao --- 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 5d8cec285582..1d1ee3c0da7b 100755 --- 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 */