1
0
Fork 0

MLK-11992: MX6 HDMI: Active HDCP keepout window when HDCP enable

When HDCP running in repeater mode,
HDCP software workaround "HW_WA_HDCP_DC0" is working in
HDCP keepout window stop state.
It will cause HDCP compliance test 1B-01A failed.
So active HDCP keepout widows and 1B-01A is	passed.

Signed-off-by: Sandor Yu <R01008@freescale.com>
pull/10/head
Sandor Yu 2015-12-11 15:57:16 +08:00 committed by Jason Liu
parent 3bd0e5eeb2
commit 6ceee12045
2 changed files with 8 additions and 1 deletions

View File

@ -1436,7 +1436,11 @@ static void hdmi_av_composer(struct mxc_hdmi *hdmi)
dev_dbg(&hdmi->pdev->dev, "final pixclk = %d\n", vmode->mPixelClock);
/* Set up HDMI_FC_INVIDCONF */
inv_val = (vmode->mVSyncPolarity ?
inv_val = (hdmi->hdmi_data.hdcp_enable ?
HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE :
HDMI_FC_INVIDCONF_HDCP_KEEPOUT_INACTIVE);
inv_val |= (vmode->mVSyncPolarity ?
HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_HIGH :
HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_LOW);

View File

@ -667,6 +667,9 @@ enum {
HDMI_VP_REMAP_YCC422_16bit = 0x0,
/* FC_INVIDCONF field values */
HDMI_FC_INVIDCONF_HDCP_KEEPOUT_MASK = 0x80,
HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE = 0x80,
HDMI_FC_INVIDCONF_HDCP_KEEPOUT_INACTIVE = 0x00,
HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_MASK = 0x40,
HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_HIGH = 0x40,
HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_LOW = 0x00,