From d6e9bc98a62c786b677696c31555b13eadfb5cfb Mon Sep 17 00:00:00 2001 From: yicheng shen Date: Wed, 25 Sep 2019 07:18:05 -0400 Subject: [PATCH] hdmirx: fix hdcp2.2 request_mem_region fail issue [1/1] PD#SWPL-14563 Problem: hdcp_rx22 passed a wrong HPI address to hdmirx driver, and cause HPI address request_mem_region fail Solution: Use the correct HPI address when request_mem_region called. Verify: TL1 Change-Id: I80bd6323ae4959edf3c792758568c581024536bb Signed-off-by: yicheng shen --- drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c | 3 ++- drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c index 832a59e20679..1a0a3c45130a 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c @@ -325,7 +325,8 @@ static long init(struct file *f, void __user *arg) rc = alloc_dma_areas(esm, &info); if (rc < 0) goto err_free; - + info.hpi_base = + reg_maps[MAP_ADDR_MODULE_HDMIRX_CAPB3].phy_addr; hpi_mem = request_mem_region(info.hpi_base, 128, "esm-hpi"); if (!hpi_mem) { rc = -EADDRNOTAVAIL; 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 6587a216bd59..6b74c7314eec 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h @@ -47,7 +47,7 @@ * * */ -#define RX_VER2 "ver.2019/09/11" +#define RX_VER2 "ver.2019/09/25" /*print type*/ #define LOG_EN 0x01