media: rockchip: rkcif: ENUM_FMT and bytesperline fixes
v2 cover media: rockchip: rkcif: ENUM_FMT and bytesperline fixes
Two fixes for rkcif capture.
Patch 1 filters VIDIOC_ENUM_FMT by the media bus code, as the video devices set V4L2_CAP_IO_MC.
Patch 2 aligns bytesperline to 8 bytes and honours a larger value requested by userspace, so DMA-BUF importers that need a larger stride alignment can use the buffers directly.
Tested on RK3588 (Radxa ROCK 5B+) with an IMX415 sensor, using libcamera with the GPU software ISP. The DVP part is compile-tested only.
Changes in v2:
- Patch 1: don't filter the DVP output formats, which have no media bus code (Mehdi)
- Patch 2: handle all planes and the DVP interface, and limit the stride to the line width register of each interface (Michael)
- Patch 2: drop "on MIPI" from the subject
v1: https://lore.kernel.org/linux-media/[email protected]
Faizel K B (2):
media: rockchip: rkcif: Filter enumerated formats by media bus code
media: rockchip: rkcif: Honour the requested bytesperline
.../rockchip/rkcif/rkcif-capture-dvp.c | 4 ++ .../rockchip/rkcif/rkcif-capture-mipi.c | 3 + .../platform/rockchip/rkcif/rkcif-common.h | 1 + .../platform/rockchip/rkcif/rkcif-stream.c | 66 +++++++++++++++++-- 4 files changed, 68 insertions(+), 6 deletions(-)
base-commit: 7969a6f407cf55b5254c824c87875452655ef11e
Signature · 1 line
2.43.0
PATCH v2 1/2 media: rockchip: rkcif: Filter enumerated formats by media bus code
VIDIOC_ENUM_FMT ignores the mbus_code field and returns all formats, although the video devices set V4L2_CAP_IO_MC. Return only the formats that match the requested media bus code. The DVP output formats have no media bus code, so they are still all returned.
Otherwise userspace can pick a pixel format that doesn't match the media bus format, and then interprets the captured data in the wrong format.
--- .../platform/rockchip/rkcif/rkcif-stream.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/media/platform/rockchip/rkcif/rkcif-stream.c +14 -4
@@ -395,13 +395,23 @@ static int rkcif_stream_enum_formats(struct file *file, void *priv, struct v4l2_fmtdesc *f) {struct rkcif_stream *stream =video_drvdata (file); +const struct rkcif_output_fmt *fmt; +unsigned int i, n =0 ; -if (f->index >= stream->out_fmts_num) -return -EINVAL ; +for (i =0 ; i < stream->out_fmts_num; i++) { + fmt = &stream->out_fmts[i]; - f->pixelformat = stream->out_fmts[f->index].fourcc; +if (f->mbus_code && fmt->mbus_code && + fmt->mbus_code != f->mbus_code) +continue ; -return 0 ; +if (n++ == f->index) { + f->pixelformat = fmt->fourcc; +return 0 ; + } + } + +return -EINVAL ; } static int rkcif_stream_enum_framesizes(struct file *file, void *fh,
Signature · 1 line
2.43.0
PATCH v2 2/2 media: rockchip: rkcif: Honour the requested bytesperline
In reply to Faizel K BThe DMA uses bytesperline as the line stride, which must be a multiple of 8 bytes, but v4l2_fill_pixfmt_mp() doesn't align it. Any larger bytesperline requested by userspace is also replaced with the minimum.
Align bytesperline to 8 bytes and honour the largest value requested for any plane, up to the limit of the line width register. The Y and UV planes share the same line width. On the DVP, program the line width from bytesperline, keeping the current value as the minimum.
This allows DMA-BUF importers that need a larger stride alignment to use the buffers directly.
--- .../rockchip/rkcif/rkcif-capture-dvp.c | 4 ++ .../rockchip/rkcif/rkcif-capture-mipi.c | 3 ++ .../platform/rockchip/rkcif/rkcif-common.h | 1 + .../platform/rockchip/rkcif/rkcif-stream.c | 48 ++++++++++++++++++- 4 files changed, 54 insertions(+), 2 deletions(-)
drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.c +4 -0
@@ -20,6 +20,8 @@#include "rkcif-regs.h" #include "rkcif-stream.h" +#define RKCIF_DVP_MAX_BYTESPERLINE 0x7ff8/* VIR_LINE_WIDTH: 15 bits */ +static const struct rkcif_output_fmt dvp_out_fmts[] = { { .fourcc =V4L2_PIX_FMT_NV16 ,
@@ -689,6 +691,7 @@ static int rkcif_dvp_start_streaming(struct rkcif_stream *stream) val = stream->pix.width;if (active_in_fmt->fmt_type ==RKCIF_FMT_TYPE_RAW ) val = stream->pix.width *2 ; + val =max (val, stream->pix.plane_fmt[0 ].bytesperline);rkcif_dvp_write (rkcif,RKCIF_DVP_VIR_LINE_WIDTH , val); val =RKCIF_XY_COORD (stream->pix.width, stream->pix.height);
@@ -827,6 +830,7 @@ int rkcif_dvp_register(struct rkcif_device *rkcif) stream->interface = interface; stream->out_fmts = rkcif->match_data->dvp->out_fmts; stream->out_fmts_num = rkcif->match_data->dvp->out_fmts_num; + stream->max_bytesperline =RKCIF_DVP_MAX_BYTESPERLINE ; stream->queue_buffer = rkcif_dvp_queue_buffer; stream->start_streaming = rkcif_dvp_start_streaming; stream->stop_streaming = rkcif_dvp_stop_streaming;
drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c +3 -0
@@ -24,6 +24,8 @@#include "rkcif-regs.h" #include "rkcif-stream.h" +#define RKCIF_MIPI_MAX_BYTESPERLINE 0xffff8/* VLW: 20 bits */ +#define RK3568_MIPI_CTRL0_HIGH_ALIGN BIT(31)#define RK3568_MIPI_CTRL0_UV_SWAP_EN BIT(7)#define RK3568_MIPI_CTRL0_COMPACT_EN BIT(6)
@@ -1026,6 +1028,7 @@ int rkcif_mipi_register(struct rkcif_device *rkcif) stream->interface = interface; stream->out_fmts = mipi_out_fmts; stream->out_fmts_num =ARRAY_SIZE (mipi_out_fmts); + stream->max_bytesperline =RKCIF_MIPI_MAX_BYTESPERLINE ; stream->queue_buffer = rkcif_mipi_queue_buffer; stream->start_streaming = rkcif_mipi_start_streaming; stream->stop_streaming = rkcif_mipi_stop_streaming;
drivers/media/platform/rockchip/rkcif/rkcif-common.h +1 -0
@@ -145,6 +145,7 @@ struct rkcif_stream {struct rkcif_interface *interface;const struct rkcif_output_fmt *out_fmts;unsigned int out_fmts_num; +u32 max_bytesperline;/* in ping-pong mode, two buffers can be provided to the HW */ struct rkcif_buffer *buffers[2 ];
drivers/media/platform/rockchip/rkcif/rkcif-stream.c +46 -2
72 lines not on this page · raw message
Signature · 1 line
2.43.0