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 791e483bba8a..6b130423aa25 100644
--- 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/06/21"
+#define RX_VER2 "ver.2018/06/27"
 
 
 /* 50ms timer for hdmirx main loop (HDMI_STATE_CHECK_FREQ is 20) */
diff --git a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c
index d22d6e602c5e..2ebda5bf83bb 100644
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_hw.c
@@ -76,7 +76,7 @@ bool hdcp_enable = 1;
 int acr_mode;
 int auto_aclk_mute = 2;
 int aud_avmute_en = 1;
-int aud_mute_sel;
+int aud_mute_sel = 2;
 int force_clk_rate;
 int md_ists_en = VIDEO_MODE;
 int pdec_ists_en;/* = AVI_CKS_CHG | DVIDET | DRM_CKS_CHG | DRM_RCV_EN;*/
@@ -738,7 +738,8 @@ void rx_get_audinfo(struct aud_info_s *audio_info)
  */
 void rx_get_audio_status(struct rx_audio_stat_s *aud_sts)
 {
-	if (rx.state == FSM_SIG_READY) {
+	if ((rx.state == FSM_SIG_READY) &&
+		(rx.avmute_skip == 0)) {
 		aud_sts->aud_rcv_flag =
 			(rx.aud_info.aud_packet_received == 0) ? false : true;
 		aud_sts->aud_stb_flag = true;
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 c6bf35dcb557..892b543a6b96 100644
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
@@ -1256,6 +1256,14 @@ bool is_unnormal_format(uint8_t wait_cnt)
 			ret = false;
 		}
 	}
+	if (rx.hdcp.hdcp_version == HDCP_VER_NONE) {
+		ret = true;
+		if (wait_cnt == hdcp_none_wait_max) {
+			ret = false;
+			if (log_level & VIDEO_LOG)
+				rx_pr("hdcp none waiting\n");
+		}
+	}
 	if ((ret == false) && (wait_cnt != sig_stable_max))
 		if (log_level & VIDEO_LOG)
 			rx_pr("unnormal_format wait cnt = %d\n",
@@ -1283,12 +1291,6 @@ bool is_unnormal_format(uint8_t wait_cnt)
 			rx_pr("hdcp14 unfinished\n");
 		}
 	#endif
-	if (rx.hdcp.hdcp_version == HDCP_VER_NONE) {
-		if (wait_cnt < hdcp_none_wait_max)
-			ret = true;
-		if (log_level & VIDEO_LOG)
-			rx_pr("hdcp none waiting\n");
-	}
 	return ret;
 }