Skip to content

Commit 9fae824

Browse files
Andy Yanmmind
authored andcommitted
drm/rockchip: vop2: Add delay between poll registers
According to the implementation of read_poll_timeout_atomic, if the delay time is 0, it will only use a simple loop based on timeout_us to decrement the count. Therefore, the final timeout time will differ significantly from the set timeout time. So, here we set a specific delay time to ensure that the calculation of the timeout duration is accurate. Fixes: 3e89a8c ("drm/rockchip: vop2: Fix the update of LAYER/PORT select registers when there are multi display output on rk3588/rk3568") Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patch.msgid.link/20250718064120.8811-1-andyshrk@163.com
1 parent 3ea3b78 commit 9fae824

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/rockchip/rockchip_vop2_reg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,7 @@ static void rk3568_vop2_wait_for_port_mux_done(struct vop2 *vop2)
21042104
* Spin until the previous port_mux figuration is done.
21052105
*/
21062106
ret = readx_poll_timeout_atomic(rk3568_vop2_read_port_mux, vop2, port_mux_sel,
2107-
port_mux_sel == vop2->old_port_sel, 0, 50 * 1000);
2107+
port_mux_sel == vop2->old_port_sel, 10, 50 * 1000);
21082108
if (ret)
21092109
DRM_DEV_ERROR(vop2->dev, "wait port_mux done timeout: 0x%x--0x%x\n",
21102110
port_mux_sel, vop2->old_port_sel);
@@ -2124,7 +2124,7 @@ static void rk3568_vop2_wait_for_layer_cfg_done(struct vop2 *vop2, u32 cfg)
21242124
* Spin until the previous layer configuration is done.
21252125
*/
21262126
ret = readx_poll_timeout_atomic(rk3568_vop2_read_layer_cfg, vop2, atv_layer_cfg,
2127-
atv_layer_cfg == cfg, 0, 50 * 1000);
2127+
atv_layer_cfg == cfg, 10, 50 * 1000);
21282128
if (ret)
21292129
DRM_DEV_ERROR(vop2->dev, "wait layer cfg done timeout: 0x%x--0x%x\n",
21302130
atv_layer_cfg, cfg);

0 commit comments

Comments
 (0)