media: ti-vpe: allow user specified stride
cover media: ti-vpe: allow user specified stride
This patch series enables user specified buffer stride to be used instead of always forcing the stride from the driver side.
Benoit Parrot (2):
media: ti-vpe: vpdma: add support for user specified stride
media: ti-vpe: vpe: allow use of user specified stride
drivers/media/platform/ti-vpe/vpdma.c | 14 ++++---------- drivers/media/platform/ti-vpe/vpdma.h | 6 +++--- drivers/media/platform/ti-vpe/vpe.c | 34 ++++++++++++++++++++++++---------- 3 files changed, 31 insertions(+), 23 deletions(-)
Signature · 1 line
2.9.0
PATCH 1/2 media: ti-vpe: vpdma: add support for user specified stride
This patch introduce the needed vpdma API changes to support user space specified stride instead of forcing a driver calculated one.
--- drivers/media/platform/ti-vpe/vpdma.c | 14 ++++---------- drivers/media/platform/ti-vpe/vpdma.h | 6 +++--- drivers/media/platform/ti-vpe/vpe.c | 6 ++++-- 3 files changed, 11 insertions(+), 15 deletions(-)
drivers/media/platform/ti-vpe/vpdma.c +4 -10
@@ -801,17 +801,17 @@ static void dump_dtd(struct vpdma_dtd *dtd)* flags: VPDMA flags to configure some descriptor fileds */ void vpdma_add_out_dtd (struct vpdma_desc_list *list,int width, -const struct v4l2_rect *c_rect, +int stride,const struct v4l2_rect *c_rect,const struct vpdma_data_format *fmt,dma_addr_t dma_addr,int max_w,int max_h,enum vpdma_channel chan,u32 flags) { -vpdma_rawchan_add_out_dtd (list, width, c_rect, fmt, dma_addr, +vpdma_rawchan_add_out_dtd (list, width, stride, c_rect, fmt, dma_addr, max_w, max_h, chan_info[chan].num, flags); }EXPORT_SYMBOL (vpdma_add_out_dtd);void vpdma_rawchan_add_out_dtd (struct vpdma_desc_list *list,int width, -const struct v4l2_rect *c_rect, +int stride,const struct v4l2_rect *c_rect,const struct vpdma_data_format *fmt,dma_addr_t dma_addr,int max_w,int max_h,int raw_vpdma_chan,u32 flags) {
@@ -821,7 +821,6 @@ void vpdma_rawchan_add_out_dtd(struct vpdma_desc_list *list, int width,int channel, next_chan;struct v4l2_rect rect = *c_rect;int depth = fmt->depth; -int stride;struct vpdma_dtd *dtd; channel = next_chan = raw_vpdma_chan;
@@ -833,8 +832,6 @@ void vpdma_rawchan_add_out_dtd(struct vpdma_desc_list *list, int width, depth =8 ; } - stride =ALIGN ((depth * width) >>3 ,VPDMA_STRIDE_ALIGN ); - dma_addr += rect.top * stride + (rect.left * depth >>3 ); dtd = list->next;
@@ -882,7 +879,7 @@ EXPORT_SYMBOL(vpdma_rawchan_add_out_dtd);* contribute to the client) */ void vpdma_add_in_dtd (struct vpdma_desc_list *list,int width, -const struct v4l2_rect *c_rect, +int stride,const struct v4l2_rect *c_rect,const struct vpdma_data_format *fmt,dma_addr_t dma_addr,enum vpdma_channel chan,int field,u32 flags,int frame_width,int frame_height,int start_h,int start_v)
@@ -892,7 +889,6 @@ void vpdma_add_in_dtd(struct vpdma_desc_list *list, int width,int depth = fmt->depth;int channel, next_chan;struct v4l2_rect rect = *c_rect; -int stride;struct vpdma_dtd *dtd; channel = next_chan = chan_info[chan].num;
@@ -904,8 +900,6 @@ void vpdma_add_in_dtd(struct vpdma_desc_list *list, int width, depth =8 ; } - stride =ALIGN ((depth * width) >>3 ,VPDMA_STRIDE_ALIGN ); - dma_addr += rect.top * stride + (rect.left * depth >>3 ); dtd = list->next;
drivers/media/platform/ti-vpe/vpdma.h +3 -3
@@ -242,16 +242,16 @@ void vpdma_add_sync_on_channel_ctd(struct vpdma_desc_list *list,void vpdma_add_abort_channel_ctd (struct vpdma_desc_list *list,int chan_num);void vpdma_add_out_dtd (struct vpdma_desc_list *list,int width, -const struct v4l2_rect *c_rect, +int stride,const struct v4l2_rect *c_rect,const struct vpdma_data_format *fmt,dma_addr_t dma_addr,int max_w,int max_h,enum vpdma_channel chan,u32 flags);void vpdma_rawchan_add_out_dtd (struct vpdma_desc_list *list,int width, -const struct v4l2_rect *c_rect, +int stride,const struct v4l2_rect *c_rect,const struct vpdma_data_format *fmt,dma_addr_t dma_addr,int max_w,int max_h,int raw_vpdma_chan,u32 flags);void vpdma_add_in_dtd (struct vpdma_desc_list *list,int width, -const struct v4l2_rect *c_rect, +int stride,const struct v4l2_rect *c_rect,const struct vpdma_data_format *fmt,dma_addr_t dma_addr,enum vpdma_channel chan,int field,u32 flags,int frame_width,int frame_height,int start_h,int start_v);
drivers/media/platform/ti-vpe/vpe.c +4 -2
@@ -1085,7 +1085,8 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port)vpdma_set_max_size (ctx->dev->vpdma,VPDMA_MAX_SIZE1 ,MAX_W ,MAX_H ); -vpdma_add_out_dtd (&ctx->desc_list, q_data->width, &q_data->c_rect, +vpdma_add_out_dtd (&ctx->desc_list, q_data->width, + q_data->bytesperline[VPE_LUMA ], &q_data->c_rect, vpdma_fmt, dma_addr,MAX_OUT_WIDTH_REG1 ,MAX_OUT_HEIGHT_REG1 , p_data->channel, flags); }
@@ -1169,7 +1170,8 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)if (p_data->vb_part && fmt->fourcc ==V4L2_PIX_FMT_NV12 ) frame_height /=2 ; -vpdma_add_in_dtd (&ctx->desc_list, q_data->width, &q_data->c_rect, +vpdma_add_in_dtd (&ctx->desc_list, q_data->width, + q_data->bytesperline[VPE_LUMA ], &q_data->c_rect, vpdma_fmt, dma_addr, p_data->channel, field, flags, frame_width, frame_height,0 ,0 ); }
Signature · 1 line
2.9.0
PATCH 2/2 media: ti-vpe: vpe: allow use of user specified stride
In reply to Benoit ParrotBytesperline/stride was always overwritten by VPE to the most adequate value based on needed alignment.
However in order to make use of arbitrary size DMA buffer it is better to use the user space provide stride instead.
The driver will still calculate an appropriate stride but will use the provided one when it is larger than the calculated one.
--- drivers/media/platform/ti-vpe/vpe.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/media/platform/ti-vpe/vpe.c +20 -8
@@ -1597,6 +1597,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,struct v4l2_plane_pix_format *plane_fmt;unsigned int w_align;int i, depth, depth_bytes, height; +unsigned int stride =0 ;if (!fmt || !(fmt->types & type)) { vpe_err(ctx->dev, "Fourcc format (0x%08x) invalid.\n",
@@ -1683,16 +1684,27 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f, plane_fmt = &pix->plane_fmt[i]; depth = fmt->vpdma_fmt[i]->depth; -if (i ==VPE_LUMA ) - plane_fmt->bytesperline = (pix->width * depth) >>3 ; -else - plane_fmt->bytesperline = pix->width; + stride = (pix->width * fmt->vpdma_fmt[VPE_LUMA ]->depth) >>3 ; +if (stride > plane_fmt->bytesperline) + plane_fmt->bytesperline = stride; + + plane_fmt->bytesperline =ALIGN (plane_fmt->bytesperline, +VPDMA_STRIDE_ALIGN ); -if (pix->num_planes ==1 && fmt->coplanar) - depth += fmt->vpdma_fmt[VPE_CHROMA ]->depth; - plane_fmt->sizeimage = - (pix->height * pix->width * depth) >>3 ; +if (i ==VPE_LUMA ) { + plane_fmt->sizeimage = pix->height * + plane_fmt->bytesperline; +if (pix->num_planes ==1 && fmt->coplanar) + plane_fmt->sizeimage += pix->height * + plane_fmt->bytesperline * + fmt->vpdma_fmt[VPE_CHROMA ]->depth >>3 ; + + }else {/* i == VIP_CHROMA */ + plane_fmt->sizeimage = (pix->height * + plane_fmt->bytesperline * + depth) >>3 ; + }memset (plane_fmt->reserved,0 ,sizeof (plane_fmt->reserved)); }
Signature · 1 line
2.9.0
Re: [Patch 2/2] media: ti-vpe: vpe: allow use of user specified stride
Hi,
Quoted 27 lines · Benoit Parrot
Bytesperline/stride was always overwritten by VPE to the most adequate value based on needed alignment.
However in order to make use of arbitrary size DMA buffer it is better to use the user space provide stride instead.
The driver will still calculate an appropriate stride but will use the provided one when it is larger than the calculated one.
Signed-off-by Benoit Parrot <[email protected]>--- drivers/media/platform/ti-vpe/vpe.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)drivers/media/platform/ti-vpe/vpe.c +1
-0@@ -1597,6 +1597,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,struct v4l2_plane_pix_format *plane_fmt;unsigned int w_align;int i, depth, depth_bytes, height; +unsigned int stride =0 ;if (!fmt || !(fmt->types & type)) { vpe_err(ctx->dev, "Fourcc format (0x%08x) invalid.\n",
drivers/media/platform/ti-vpe/vpe.c static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f, · line 1689
Quoted 10 lines
drivers/media/platform/ti-vpe/vpe.c +3
-4@@ -1683,16 +1684,27 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f, plane_fmt = &pix->plane_fmt[i]; depth = fmt->vpdma_fmt[i]->depth; -if (i ==VPE_LUMA ) - plane_fmt->bytesperline = (pix->width * depth) >>3 ; -else - plane_fmt->bytesperline = pix->width; + stride = (pix->width * fmt->vpdma_fmt[VPE_LUMA ]->depth) >>3 ; +if (stride > plane_fmt->bytesperline) + plane_fmt->bytesperline = stride;
The old code calculates different bytes per line for luma and chroma, but the new one calculates only for luma. Is that correct?
Tomi
Re: [Patch 2/2] media: ti-vpe: vpe: allow use of user specified stride
Tomi Valkeinen <[email protected]> wrote on Wed [2017-Feb-15 13:22:42 +0200]:
Quoted 33 lines
Hi,
Quoted 30 lines · Benoit Parrot
Bytesperline/stride was always overwritten by VPE to the most adequate value based on needed alignment.
However in order to make use of arbitrary size DMA buffer it is better to use the user space provide stride instead.
The driver will still calculate an appropriate stride but will use the provided one when it is larger than the calculated one.
Signed-off-by Benoit Parrot <[email protected]>--- drivers/media/platform/ti-vpe/vpe.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)drivers/media/platform/ti-vpe/vpe.c +1
-0@@ -1597,6 +1597,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,struct v4l2_plane_pix_format *plane_fmt;unsigned int w_align;int i, depth, depth_bytes, height; +unsigned int stride =0 ;if (!fmt || !(fmt->types & type)) { vpe_err(ctx->dev, "Fourcc format (0x%08x) invalid.\n",@@ -1683,16 +1684,27 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f, plane_fmt = &pix->plane_fmt[i]; depth = fmt->vpdma_fmt[i]->depth;
Quoted 10 lines
drivers/media/platform/ti-vpe/vpe.c static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f, · line 1689
Quoted 7 lines
drivers/media/platform/ti-vpe/vpe.c +3
-4-if (i ==VPE_LUMA ) - plane_fmt->bytesperline = (pix->width * depth) >>3 ; -else - plane_fmt->bytesperline = pix->width; + stride = (pix->width * fmt->vpdma_fmt[VPE_LUMA ]->depth) >>3 ; +if (stride > plane_fmt->bytesperline) + plane_fmt->bytesperline = stride;The old code calculates different bytes per line for luma and chroma, but the new one calculates only for luma. Is that correct?
The previous method which happened to produce the correct value was not proper as the spec for NV12/NV16 states that the chroma bytes per line/stride should be the same as the LUMA stride only the number of lines might differ which affect how the sizeimage component is calculated. This patch takes that into account.
Benoit
Quoted 3 lines
Tomi
Quoted 11 lines · Benoit Parrot
This patch series enables user specified buffer stride to be used instead of always forcing the stride from the driver side.
Benoit Parrot (2):
media: ti-vpe: vpdma: add support for user specified stride
media: ti-vpe: vpe: allow use of user specified stridedrivers/media/platform/ti-vpe/vpdma.c | 14 ++++---------- drivers/media/platform/ti-vpe/vpdma.h | 6 +++--- drivers/media/platform/ti-vpe/vpe.c | 34 ++++++++++++++++++++++++---------- 3 files changed, 31 insertions(+), 23 deletions(-)
Tomi
Hans, Mauro,
Ping.
Regards,
Benoit
Tomi Valkeinen <[email protected]> wrote on Fri [2017-Feb-17 11:45:41 +0200]:
Quoted 17 lines · Benoit Parrot
Quoted 11 lines
This patch series enables user specified buffer stride to be used instead of always forcing the stride from the driver side.
Benoit Parrot (2):
media: ti-vpe: vpdma: add support for user specified stride
media: ti-vpe: vpe: allow use of user specified stridedrivers/media/platform/ti-vpe/vpdma.c | 14 ++++---------- drivers/media/platform/ti-vpe/vpdma.h | 6 +++--- drivers/media/platform/ti-vpe/vpe.c | 34 ++++++++++++++++++++++++---------- 3 files changed, 31 insertions(+), 23 deletions(-)Reviewed-by Tomi Valkeinen <[email protected]>Tomi