hdmirx: fix hdcp14 key reg error

PD#172916: hdmirx: fix hdcp14 key reg error

Change-Id: I0d614ee875c380cf877bba1e6e7ed236400b0563
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>

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 061e7bf..862a525 100644 (file)
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
@@ -46,7 +46,7 @@
  *
  *
  */
-#define RX_VER2 "ver.2018/8/20"
+#define RX_VER2 "ver.2018/09/04"
 
 /*print type*/
 #define        LOG_EN          0x01

diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
index c4c07d8..fa76464 100644 (file)
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
@@ -1264,8 +1264,8 @@ bool is_unnormal_format(uint8_t wait_cnt)
                if (sig_stable_max == wait_cnt)
                        rx_pr("hdcp14 unfinished\n");
                if (unnormal_wait_max == wait_cnt) {
-                       if ((hdmirx_rd_dwc(DWC_HDCP_KEY1) == 0) &&
-                               (hdmirx_rd_dwc(DWC_HDCP_KEY0) == 0))
+                       if ((hdmirx_rd_dwc(DWC_HDCP_BKSV1) == 0) &&
+                               (hdmirx_rd_dwc(DWC_HDCP_BKSV0) == 0))
                                rx.err_code = ERR_NO_HDCP14_KEY;
                        ret = false;
                }