hdmirx: fix hdcp2.2 does not work issue

PD#SWPL-308

Problem:
32bit kernel + 32bit userspace,driver needs to use unlocked_ioctl.
Otherwise,IOCTL can not work normally and cause esm init fail.

Solution:
Add unlocked_ioctl handle.

Verify:
Locally

Change-Id: I5a3608088633d89c76c7b7684dc4580d44b77263
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>

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 8903a58..d52b9f6 100644 (file)
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdcp_rx_main.c
@@ -404,8 +404,10 @@ static long hld_ioctl(struct file *f,
        return -ENOTTY;
 }
 static const struct file_operations hld_file_operations = {
-       /* .unlocked_ioctl = hld_ioctl, */
+       .unlocked_ioctl = hld_ioctl,
+       #ifdef CONFIG_COMPAT
        .compat_ioctl = hld_ioctl,
+       #endif
        .owner = THIS_MODULE,
 };
 

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 54a308e..be8cd89 100644 (file)
--- 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-11"
+#define RX_VER0 "ver.2018-10-15"
 /*
  *
  *