From 7871f4dbaf041aa1d3441589768b89bc72dd400b Mon Sep 17 00:00:00 2001 From: Yandong Lin Date: Mon, 10 Mar 2025 17:38:25 +0800 Subject: [PATCH] media: rockchip: vpss: support vpss-dvbm wrap Change-Id: I03c53d4c66cfad276ea0f4aed25b9e0019f893e6 Signed-off-by: Yandong Lin --- drivers/media/platform/rockchip/vpss/vpss_dvbm.c | 8 ++++---- drivers/media/platform/rockchip/vpss/vpss_offline_dvbm.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/rockchip/vpss/vpss_dvbm.c b/drivers/media/platform/rockchip/vpss/vpss_dvbm.c index fa24d5163b60..e87033d02298 100644 --- a/drivers/media/platform/rockchip/vpss/vpss_dvbm.c +++ b/drivers/media/platform/rockchip/vpss/vpss_dvbm.c @@ -30,7 +30,7 @@ int rkvpss_dvbm_get(struct rkvpss_device *vpss_dev) } else { struct platform_device *p_dvbm = of_find_device_by_node(np_dvbm); - g_dvbm = rk_dvbm_get_port(p_dvbm, DVBM_ISP_PORT); + g_dvbm = rk_dvbm_get_port(p_dvbm, DVBM_VPSS_PORT); put_device(&p_dvbm->dev); } @@ -62,7 +62,7 @@ int rkvpss_dvbm_init(struct rkvpss_stream *stream) dvbm_cfg.cbuf_lstd = width; dvbm_cfg.cbuf_fstd = dvbm_cfg.ybuf_fstd / 2; - rk_dvbm_ctrl(g_dvbm, DVBM_ISP_SET_CFG, &dvbm_cfg); + rk_dvbm_ctrl(g_dvbm, DVBM_VPSS_SET_CFG, &dvbm_cfg); rk_dvbm_link(g_dvbm, 0); return 0; } @@ -88,10 +88,10 @@ int rkvpss_dvbm_event(struct rkvpss_device *vpss_dev, u32 event) switch (event) { case ROCKIT_DVBM_START: - cmd = DVBM_ISP_FRM_START; + cmd = DVBM_VPSS_FRM_START; break; case ROCKIT_DVBM_END: - cmd = DVBM_ISP_FRM_END; + cmd = DVBM_VPSS_FRM_END; break; default: return -EINVAL; diff --git a/drivers/media/platform/rockchip/vpss/vpss_offline_dvbm.c b/drivers/media/platform/rockchip/vpss/vpss_offline_dvbm.c index bbe322911af8..dcc8050766e2 100644 --- a/drivers/media/platform/rockchip/vpss/vpss_offline_dvbm.c +++ b/drivers/media/platform/rockchip/vpss/vpss_offline_dvbm.c @@ -29,7 +29,7 @@ int rkvpss_ofl_dvbm_get(struct rkvpss_offline_dev *ofl) } else { struct platform_device *p_dvbm = of_find_device_by_node(np_dvbm); - g_ofl_dvbm = rk_dvbm_get_port(p_dvbm, DVBM_ISP_PORT); + g_ofl_dvbm = rk_dvbm_get_port(p_dvbm, DVBM_VPSS_PORT); put_device(&p_dvbm->dev); } @@ -58,7 +58,7 @@ int rkvpss_ofl_dvbm_init(struct dma_buf *dbuf, u32 dma_addr, u32 wrap_line, dvbm_cfg.cbuf_fstd = dvbm_cfg.ybuf_fstd / 2; dvbm_cfg.chan_id = id; - rk_dvbm_ctrl(g_ofl_dvbm, DVBM_ISP_SET_CFG, &dvbm_cfg); + rk_dvbm_ctrl(g_ofl_dvbm, DVBM_VPSS_SET_CFG, &dvbm_cfg); rk_dvbm_link(g_ofl_dvbm, id); return 0; @@ -82,10 +82,10 @@ int rkvpss_ofl_dvbm_event(u32 event, u32 seq) switch (event) { case ROCKIT_DVBM_START: - cmd = DVBM_ISP_FRM_START; + cmd = DVBM_VPSS_FRM_START; break; case ROCKIT_DVBM_END: - cmd = DVBM_ISP_FRM_END; + cmd = DVBM_VPSS_FRM_END; break; default: return -EINVAL;