summaryrefslogtreecommitdiff
authoryicheng shen <yicheng.shen@amlogic.com>2019-06-18 07:28:51 (GMT)
committer yicheng shen <yicheng.shen@amlogic.com>2019-06-19 06:39:15 (GMT)
commit44fb20f15365221271d223782fa89931d53ec68e (patch)
tree177003a3c161ae78d98d7fe01e0888ddf60103b6
parentbe00d3acdc8fb3250e54d74772018a6ab8ee7d6e (diff)
downloadcommon-44fb20f15365221271d223782fa89931d53ec68e.zip
common-44fb20f15365221271d223782fa89931d53ec68e.tar.gz
common-44fb20f15365221271d223782fa89931d53ec68e.tar.bz2
hdmitx: fix panic issue during suspend_resume test [1/1]
PD#OTT-4206 Problem: Kernel panic occurred when suspend and resume DUT Solution: some memery is not released totally before resume, Need to clear the variable value Verify: Atom Change-Id: I834c2edad7878d697bf150357c656f130505dcbd Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
Diffstat
-rw-r--r--drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c1
-rw-r--r--include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
index dc51e78..357b3e6 100644
--- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
+++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
@@ -126,6 +126,7 @@ static void hdmitx_early_suspend(struct early_suspend *h)
phdmi->output_blank_flag = 0;
phdmi->HWOp.CntlDDC(phdmi, DDC_HDCP_MUX_INIT, 1);
phdmi->HWOp.CntlDDC(phdmi, DDC_HDCP_OP, HDCP14_OFF);
+ hdmitx_edid_clear(phdmi);
extcon_set_state_sync(hdmitx_extcon_power, EXTCON_DISP_HDMI, 0);
phdmi->HWOp.CntlConfig(&hdmitx_device, CONF_CLR_AVI_PACKET, 0);
phdmi->HWOp.CntlConfig(&hdmitx_device, CONF_CLR_VSDB_PACKET, 0);
diff --git a/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h b/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
index 775f6e1..9b177bc 100644
--- a/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
+++ b/include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_module.h
@@ -27,7 +27,7 @@
#include <linux/pinctrl/consumer.h>
/* HDMITX driver version */
-#define HDMITX_VER "20190613"
+#define HDMITX_VER "20190618"
/* chip type */
#define MESON_CPU_ID_M8B 0