From f054aaaaaefb89e232e2bda2b8c61e32caaab67f Mon Sep 17 00:00:00 2001 From: "congyang.huang" Date: Thu, 23 Oct 2025 06:06:38 +0000 Subject: [PATCH] vout: fix potential issue with vout frame rate calculation [1/1] PD#SWPL-236564 Problem: the logic for calculating the frame rate in vout is risky. the reason it currently functions without issues is that the vdin module also calls it and correctly configures the clk Solution: vdin_meas_clk_val needs to be assigned a value first, and then it can be used for msr_ctrl_init Verify: t6x/t3x Change-Id: Id76c7581aefb040a4ced30a8964c04f43d5f3532 Signed-off-by: congyang.huang --- drivers/media/vout/vout_serve/vout_mux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/vout/vout_serve/vout_mux.c b/drivers/media/vout/vout_serve/vout_mux.c index bfe4bdb8e..f26fa80c2 100644 --- a/drivers/media/vout/vout_serve/vout_mux.c +++ b/drivers/media/vout/vout_serve/vout_mux.c @@ -610,12 +610,12 @@ static int vout_mux_probe(struct platform_device *pdev) } vout_mux_data = (struct vout_mux_data_s *)match->data; + if (is_meson_t3x_cpu() || is_meson_t6x_cpu()) + vdin_meas_clk_val = VDIN_MEAS_CLK_FREQ_T3X; + if (vout_mux_data->msr_ctrl_init) vout_mux_data->msr_ctrl_init(pdev, vout_mux_data); - if (is_meson_t3x_cpu()) - vdin_meas_clk_val = VDIN_MEAS_CLK_FREQ_T3X; - VOUTPR("%s OK\n", __func__); return 0;