From 6fbde9752425900146956dd472cf371127b56768 Mon Sep 17 00:00:00 2001 From: yicheng shen Date: Fri, 7 Sep 2018 14:21:32 +0800 Subject: [PATCH] hdmirx: add hdcp22-not-support handle[2/2] PD#173334: hdmirx: add hdcp22-not-support handle if systemcontrol cant access the aic tool,inform driver that hdcp2.2 is not support via ioctl Change-Id: I2d9541a497842e027e898f5fa3a23c51583c8181 Signed-off-by: yicheng shen --- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c | 11 +++++++++++ drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c index 9b745c8..25ed702 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.c @@ -1046,6 +1046,17 @@ static long hdmirx_ioctl(struct file *file, unsigned int cmd, } rx_pr("hdcp1.4 key mode-%d\n", hdcp14_key_mode); break; + case HDMI_IOC_HDCP22_NOT_SUPPORT: + /* if sysctl can not find the aic tools, + * it will inform driver that 2.2 not support via ioctl + */ + hdcp22_on = 0; + if (rx.open_fg) + rx_send_hpd_pulse(); + else + hdmirx_wr_dwc(DWC_HDCP22_CONTROL, 2); + rx_pr("hdcp2.2 not support\n"); + break; default: ret = -ENOIOCTLCMD; break; diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h index b248ca2..54a308e 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h @@ -34,7 +34,7 @@ #include "hdmi_rx_edid.h" -#define RX_VER0 "ver.2018-09-07" +#define RX_VER0 "ver.2018-09-11" /* * * @@ -131,6 +131,7 @@ struct hdmirx_dev_s { struct pd_infoframe_s) #define HDMI_IOC_HDCP14_KEY_MODE _IOR(HDMI_IOC_MAGIC, 0x0d,\ enum hdcp14_key_mode_e) +#define HDMI_IOC_HDCP22_NOT_SUPPORT _IO(HDMI_IOC_MAGIC, 0x0e) #define IOC_SPD_INFO _BIT(0) #define IOC_AUD_INFO _BIT(1) -- 2.7.4