@@ -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;
@@ -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;
@@ -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];
@@ -23,6 +23,7 @@
#define CIF_MIN_HEIGHT 64
#define CIF_MAX_WIDTH 8192
#define CIF_MAX_HEIGHT 8192
+#define CIF_BYTESPERLINE_ALIGN 8
static inline struct rkcif_buffer *to_rkcif_buffer(struct vb2_v4l2_buffer *vb)
{
@@ -334,20 +335,63 @@ static const struct vb2_ops rkcif_stream_vb2_ops = {
.stop_streaming = rkcif_stream_stop_streaming,
};
+static u32 rkcif_stream_plane_lines(const struct v4l2_format_info *info,
+ unsigned int plane, u32 height)
+{
+ return plane ? DIV_ROUND_UP(height, info->vdiv) : height;
+}
+
+static void rkcif_stream_set_bytesperline(struct rkcif_stream *stream,
+ struct v4l2_pix_format_mplane *pix,
+ u32 req_bpl)
+{
+ const struct v4l2_format_info *info = v4l2_format_info(pix->pixelformat);
+ u32 bpl = pix->plane_fmt[0].bytesperline;
+ u32 total_lines = 0, max_bpl;
+ unsigned int i;
+
+ for (i = 0; i < info->comp_planes; i++)
+ total_lines += rkcif_stream_plane_lines(info, i, pix->height);
+
+ max_bpl = min(stream->max_bytesperline,
+ ALIGN_DOWN(U32_MAX / total_lines, CIF_BYTESPERLINE_ALIGN));
+ if (req_bpl > bpl && req_bpl <= max_bpl)
+ bpl = ALIGN(req_bpl, CIF_BYTESPERLINE_ALIGN);
+
+ /* The Y and UV planes share the same line width. */
+ if (info->mem_planes == 1) {
+ pix->plane_fmt[0].bytesperline = bpl;
+ pix->plane_fmt[0].sizeimage = bpl * total_lines;
+ } else {
+ for (i = 0; i < info->mem_planes; i++) {
+ pix->plane_fmt[i].bytesperline = bpl;
+ pix->plane_fmt[i].sizeimage =
+ bpl * rkcif_stream_plane_lines(info, i,
+ pix->height);
+ }
+ }
+}
+
static int rkcif_stream_fill_format(struct rkcif_stream *stream,
struct v4l2_pix_format_mplane *pix)
{
const struct rkcif_output_fmt *fmt;
- u32 height, width;
+ u32 height, width, req_bpl = 0;
+ unsigned int i;
int ret;
fmt = rkcif_stream_find_output_fmt(stream, true, pix->pixelformat);
height = clamp_t(u32, pix->height, CIF_MIN_HEIGHT, CIF_MAX_HEIGHT);
width = clamp_t(u32, pix->width, CIF_MIN_WIDTH, CIF_MAX_WIDTH);
- ret = v4l2_fill_pixfmt_mp(pix, fmt->fourcc, width, height);
+ for (i = 0; i < pix->num_planes; i++)
+ req_bpl = max(req_bpl, pix->plane_fmt[i].bytesperline);
+ ret = v4l2_fill_pixfmt_mp_aligned(pix, fmt->fourcc, width, height,
+ CIF_BYTESPERLINE_ALIGN);
if (ret)
return ret;
+ rkcif_stream_set_bytesperline(stream, pix, req_bpl);
+
pix->field = V4L2_FIELD_NONE;
return 0;
The 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. Signed-off-by: Faizel K B <faizel.kb@gmail.com> --- .../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(-)