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

video: rockchip: hdmi: 3288w: support HDCP2.2

Browse Source 
Change-Id: Ie20cba47fa925b5a3cce49ec2557e47ce737459e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit db93f1aadfa06f47a0b9041b172cfcc4028e4928)
This commit is contained in:
Zheng Yang
2015-09-29 09:25:55 +08:00
parent c196bbf342
commit c7eae6490c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hdcp.c
View File

@@ -411,8 +411,11 @@ void rockchip_hdmiv2_hdcp2_enable(int enable)
return;
}
hdmi_dev = hdcp->hdmi->property->priv;
if (hdmi_dev->soctype == HDMI_SOC_RK3368 &&
hdmi_dev->hdcp2_enable != enable) {
if ((hdmi_readl(hdmi_dev, CONFIG1_ID) & m_HDCP22) == 0) {
pr_err("Don't support hdcp22\n");
return;
}
if (hdmi_dev->hdcp2_enable != enable) {
hdmi_dev->hdcp2_enable = enable;
if (hdmi_dev->hdcp2_enable == 0) {
hdmi_msk_reg(hdmi_dev, HDCP2REG_CTRL,
@@ -454,7 +457,7 @@ static void rockchip_hdmiv2_hdcp_start(struct hdmi *hdmi)
if (!hdcp->enable)
return;
if (hdmi_dev->soctype == HDMI_SOC_RK3368) {
if (hdmi_readl(hdmi_dev, CONFIG1_ID) & m_HDCP22) {
if (hdmi_dev->hdcp2_enable == 0) {
hdmi_msk_reg(hdmi_dev, HDCP2REG_CTRL,
m_HDCP2_OVR_EN | m_HDCP2_FORCE,

1
drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.h
View File

@@ -81,6 +81,7 @@ enum {
#define m_HDCP (1 << 0)
#define CONFIG1_ID 0x0005
#define m_HDCP22 (1 << 6)
#define m_HDMI20 (1 << 5)
#define m_CONFAPB (1 << 1)