From 313e8b05f95597dd7d00496bd0d4b3a181482396 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Tue, 23 Jan 2024 10:35:53 +0800 Subject: [PATCH] media: rockchip: vicap get_channel_info add param of field to cover value from get_fmt Signed-off-by: Zefa Chen Change-Id: I552a42ccfa87e61a72b2ce9bd342e41d5e216a13 --- drivers/media/platform/rockchip/cif/capture.c | 4 ++++ include/uapi/linux/rk-camera-module.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 0a37aad7fd57..74b2e09cb35e 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -905,6 +905,10 @@ cif_input_fmt *rkcif_get_input_fmt(struct rkcif_device *dev, struct v4l2_rect *r if (ch_info.data_bit > 0) csi_info->data_bit = ch_info.data_bit; } + if (ch_info.field == 0) + fmt.format.field = V4L2_FIELD_NONE; + else + fmt.format.field = ch_info.field; } else { csi_info->vc = 0xff; } diff --git a/include/uapi/linux/rk-camera-module.h b/include/uapi/linux/rk-camera-module.h index d25977d3b878..334b6915a733 100644 --- a/include/uapi/linux/rk-camera-module.h +++ b/include/uapi/linux/rk-camera-module.h @@ -669,6 +669,7 @@ struct rkmodule_channel_info { __u32 bus_fmt; __u32 data_type; __u32 data_bit; + __u32 field; } __attribute__ ((packed)); /*