diff --git a/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c b/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c index f87f2e138..0efec163a 100644 --- a/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c +++ b/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c @@ -4617,7 +4617,7 @@ void rx_main_state_machine(void) rx[port].var.sig_unstable_cnt = 0; rx[port].var.sig_stable_err_cnt = 0; rx[port].var.clk_chg_cnt = 0; - rx_pkt_initial(port); + //rx_pkt_initial(port); rx[port].state = FSM_SIG_HOLD; break; case FSM_SIG_HOLD: //todo @@ -5072,8 +5072,8 @@ void rx_port0_main_state_machine(void) rx[port].var.sig_unstable_cnt = 0; rx[port].var.sig_stable_err_cnt = 0; rx[port].var.clk_chg_cnt = 0; - reset_pcs(port); - rx_pkt_initial(port); + //reset_pcs(port); + //rx_pkt_initial(port); rx[port].state = FSM_SIG_HOLD; break; case FSM_SIG_HOLD: //todo @@ -5486,8 +5486,8 @@ void rx_port1_main_state_machine(void) rx[port].var.sig_unstable_cnt = 0; rx[port].var.sig_stable_err_cnt = 0; rx[port].var.clk_chg_cnt = 0; - reset_pcs(port); - rx_pkt_initial(port); + //reset_pcs(port); + //rx_pkt_initial(port); rx[port].state = FSM_SIG_HOLD; break; case FSM_SIG_HOLD: //todo @@ -5967,7 +5967,7 @@ void rx_port2_main_state_machine(void) rx[port].var.sig_stable_err_cnt = 0; rx[port].var.clk_chg_cnt = 0; //reset_pcs(port); - rx_pkt_initial(port); + //rx_pkt_initial(port); rx[port].var.check_dsc_de_cnt = 0; rx_switch_to_self_hsync(port, false); rx_clr_f_det(true, port); @@ -6468,7 +6468,7 @@ void rx_port3_main_state_machine(void) rx[port].var.sig_stable_err_cnt = 0; rx[port].var.clk_chg_cnt = 0; //reset_pcs(port); - rx_pkt_initial(port); + //rx_pkt_initial(port); rx[port].var.check_dsc_de_cnt = 0; rx_switch_to_self_hsync(port, false); rx_clr_f_det(true, port); diff --git a/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.h b/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.h index 9a1d210e4..bfb54cde0 100644 --- a/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.h +++ b/drivers/media/vin/tvin/hdmirx/hdmi_rx_wrapper.h @@ -46,7 +46,8 @@ /* 2024.11.27 fix fsm unnormal */ /* 2024.12.03 adjust audio fifo enable timing */ /* 2024.12.16 remove fsm restart on t3x */ -#define RX_WRAPPER_VER "ver.2024/12/16" +/* 2024.12.19 add protection when not in hdmi source */ +#define RX_WRAPPER_VER "ver.2024/12/19" struct freq_ref_s { bool interlace; diff --git a/drivers/media/vin/tvin/vdin/vdin_drv.c b/drivers/media/vin/tvin/vdin/vdin_drv.c index 9a5e8d595..23e6a113f 100644 --- a/drivers/media/vin/tvin/vdin/vdin_drv.c +++ b/drivers/media/vin/tvin/vdin/vdin_drv.c @@ -319,6 +319,9 @@ void tvin_update_vdin_prop(u8 port_type, u8 pkt_type) if (!devp || !devp->frontend || !devp->frontend->sm_ops) return; + if (!IS_HDMI_SRC(devp->parm.port)) + return; + if (devp->debug.bypass_update_prop) return;