diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c
index 45cb097577309a54a7027d70a9577320f53b9bb2..a5b258a5e823d26de6dad8cb153793ca6aa6bc9c 100644
--- a/drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c
+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-h264.c
@@ -769,7 +769,7 @@ static int rkvdec2_h264_try_ctrl(struct rkvdec2_ctx *ctx, struct v4l2_ctrl *ctrl
 	return 0;
 }
 
-const struct rkvdec2_coded_fmt_ops rkvdec2_h264_fmt_ops = {
+const struct rkvdec2_coded_fmt_ops rkvdec2_vdpu381_h264_fmt_ops = {
 	.adjust_fmt = rkvdec2_h264_adjust_fmt,
 	.get_image_fmt = rkvdec2_h264_get_image_fmt,
 	.start = rkvdec2_h264_start,
diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2-hevc.c b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-hevc.c
index af0424e32d7d098c5a780adeb5c9f7146a4a0914..2ddf485ba02b362b2294bd5fc987f2606c91f84b 100644
--- a/drivers/media/platform/rockchip/rkvdec2/rkvdec2-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2-hevc.c
@@ -1010,7 +1010,7 @@ static int rkvdec2_hevc_try_ctrl(struct rkvdec2_ctx *ctx, struct v4l2_ctrl *ctrl
 	return 0;
 }
 
-const struct rkvdec2_coded_fmt_ops rkvdec2_hevc_fmt_ops = {
+const struct rkvdec2_coded_fmt_ops rkvdec2_vdpu381_hevc_fmt_ops = {
 	.adjust_fmt = rkvdec2_hevc_adjust_fmt,
 	.start = rkvdec2_hevc_start,
 	.stop = rkvdec2_hevc_stop,
diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2.c b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.c
index 55ef852d2debc71333cd569ff496db34bc2f7132..3438d6db373ab0a55017590836ab45e0bbb792fe 100644
--- a/drivers/media/platform/rockchip/rkvdec2/rkvdec2.c
+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.c
@@ -320,7 +320,7 @@ static const struct rkvdec2_coded_fmt_desc rkvdec2_vdpu381_coded_fmts[] = {
 			.step_height = 16,
 		},
 		.ctrls = &rkvdec2_h264_ctrls,
-//		.ops = &rkvdec2_h264_fmt_ops, //TODO: Rename me
+		.ops = &rkvdec2_vdpu381_h264_fmt_ops,
 		.num_decoded_fmts = ARRAY_SIZE(rkvdec2_h264_decoded_fmts),
 		.decoded_fmts = rkvdec2_h264_decoded_fmts,
 		.subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF,
@@ -336,7 +336,7 @@ static const struct rkvdec2_coded_fmt_desc rkvdec2_vdpu381_coded_fmts[] = {
 			.step_height = 16,
 		},
 		.ctrls = &rkvdec2_hevc_ctrls,
-		.ops = &rkvdec2_hevc_fmt_ops,
+		.ops = &rkvdec2_vdpu381_hevc_fmt_ops,
 		.num_decoded_fmts = ARRAY_SIZE(rkvdec2_hevc_decoded_fmts),
 		.decoded_fmts = rkvdec2_hevc_decoded_fmts,
 		.subsystem_flags = VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF,
diff --git a/drivers/media/platform/rockchip/rkvdec2/rkvdec2.h b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.h
index 9da6ae7457367195fda1de0e6f8a9d91077d0c40..4e3a47532f60f6e3173111bf3b6319fc6e646113 100644
--- a/drivers/media/platform/rockchip/rkvdec2/rkvdec2.h
+++ b/drivers/media/platform/rockchip/rkvdec2/rkvdec2.h
@@ -162,9 +162,9 @@ static inline struct rkvdec2_ctx *fh_to_rkvdec2_ctx(struct v4l2_fh *fh)
 void rkvdec2_run_preamble(struct rkvdec2_ctx *ctx, struct rkvdec2_run *run);
 void rkvdec2_run_postamble(struct rkvdec2_ctx *ctx, struct rkvdec2_run *run);
 
-extern const struct rkvdec2_coded_fmt_ops rkvdec2_h264_fmt_ops;
+extern const struct rkvdec2_coded_fmt_ops rkvdec2_vdpu381_h264_fmt_ops;
 extern const struct rkvdec2_coded_fmt_ops rkvdec2_vdpu383_h264_fmt_ops;
-extern const struct rkvdec2_coded_fmt_ops rkvdec2_hevc_fmt_ops;
+extern const struct rkvdec2_coded_fmt_ops rkvdec2_vdpu381_hevc_fmt_ops;
 extern const struct rkvdec2_coded_fmt_ops rkvdec2_vdpu383_hevc_fmt_ops;
 
 #endif /* RKVDEC_H_ */