From 8c3828fb51b6fa78b160ce70d96b4c6984cc615d Mon Sep 17 00:00:00 2001 From: Hang Cheng Date: Mon, 7 May 2018 14:47:23 +0800 Subject: [PATCH] hdmirx: keep esm work after signal unstable PD#165782: hdmirx: keep esm work after signal unstable Change-Id: I8a79276d48cdfb15c4b9d2833378b54591500b89 Signed-off-by: Hang Cheng --- .../amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h | 2 +- .../media/vin/tvin/hdmirx/hdmi_rx_wrapper.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) 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 00813f78adff..b5ec1e2fa5e0 100644 --- 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-05-17" +#define RX_VER0 "ver.2018-05-30" /* * * 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 e392ec07d942..4d4d2f0371e2 100644 --- a/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c +++ b/drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c @@ -2138,8 +2138,16 @@ void rx_main_state_machine(void) if (esm_recovery_mode == ESM_REC_MODE_RESET) esm_set_reset(true); - else - rx_esm_tmdsclk_en(false); + /* for some hdcp2.2 devices which + * don't retry 2.2 interaction + * continuously and don't response + * to re-auth, such as chroma 2403, + * esm needs to be on work even + * before tmds is valid so that to + * not miss 2.2 interaction + */ + /* else */ + /* rx_esm_tmdsclk_en(false); */ } break; } @@ -2447,8 +2455,8 @@ void rx_main_state_machine(void) if (esm_recovery_mode == ESM_REC_MODE_RESET) esm_set_reset(true); - else - rx_esm_tmdsclk_en(false); + /* else */ + /* rx_esm_tmdsclk_en(false); */ } memset(&rx.pre, 0, sizeof(struct rx_video_info));