hdmirx: fix dishNXT box blackscreen issue [1/1]

PD#SWPL-7452

Problem:
TV is no signal when turn off and turn on dishNXT box

Solution:
clear hdcp avmute status if hdcp is not start

Verify:
962X

Change-Id: I0448e46baea4f8666b2b665f6c867fecb41fb7d0
Signed-off-by: Lei Yang <lei.yang@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 bb5b78d..96b90c7 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.2019-04-24"
+#define RX_VER0 "ver.2019-04-29"
 /*
  *
  *

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 34fd790..207ee8e 100644 (file)
--- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
+++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
@@ -1219,8 +1219,12 @@ void rx_dwc_reset(void)
        hdmirx_wr_top(TOP_SW_RESET, 0x280);
        udelay(1);
        hdmirx_wr_top(TOP_SW_RESET, 0);
-       if ((rx.hdcp.hdcp_version == HDCP_VER_NONE) &&
-               (rx_get_hdcp14_sts() != 0))
+       if (rx.hdcp.hdcp_version == HDCP_VER_NONE)
+       /* dishNXT box only send set_avmute, not clear_avmute
+        * we must clear hdcp avmute status here
+        * otherwise hdcp2.2 module does not work
+        */
+               /* (rx_get_hdcp14_sts() != 0)) */
                rx_sw_reset(2);
        else
                rx_sw_reset(1);