Enable Hantro G1 post-processor
Subsystems (4)
v4 cover Enable Hantro G1 post-processor
Hi all,
The Hantro G1 VPU post-processor block can be pipelined with the decoder hardware, allowing to perform operations such as color conversion, scaling, rotation, cropping, among others.
When the post-processor is enabled, the decoder hardware needs its own set of NV12 buffers (the native decoder format), and the post-processor is the owner of the CAPTURE buffers, allocated for the post-processed format.
This way, applications obtain post-processed
(scaled, converted, etc) buffers transparently.
This feature is implemented by exposing the post-processed pixel formats on ENUM_FMT, ordered as "preferred pixelformat first":
v4l2-ctl -d 1 --list-formats
ioctl: VIDIOC_ENUM_FMT
Type: Video Capture Multiplanar [0]: 'NV12' (Y/CbCr 4:2:0) [1]: 'YUYV' (YUYV 4:2:2)
The order of preference in ENUM_FMT can be used as a hint by applications. This series updates the uAPI specification accordingly.
When the application sets a pixel format other than NV12, the post-processor is transparently enabled.
Patch 1 updates the uAPI specification.
Patch 2 and 3 are cleanups to easier integrate the post-processor. Patch 4 introduces the post-processing support.
This is tested on RK3288 platforms with MPEG-2, VP8 and H264 streams, decoding to YUY2 surfaces. For now, this series is only adding support for NV12-to-YUY2 conversion.
Applies to media/master.
Changelog
---------
Changes v4:
* Make the post-proc queue as deep as the capture queue.
* Rework the mmio read/write/relaxed helpers to avoid impacting the VP8 implementation.
* Rename prepare/finish_run to avoid confusion.
* Remove HANTRO_PP_REG_WRITE unneeded checks.
* Add a comment in vidioc_enum_fmt regarding the format enumeration order.
Changes v3:
* After discussing with Hans and Tomasz during the media summit in ELCE, we decided to go back on the MC changes. The MC topology is now untouched. This means the series is now similar to v1, except we explicitly use the ENUM_FMT to hint about the post-processed formats.
Changes v2:
* The decoder->post-processor topology is now exposed explicitly and applications need to configure the pipeline. By default, the decoder is enabled and the post-processor is disabled.
* RGB post-processing output has been dropped. We might add this in the future, but for now, it seems it would make the code more complex without a use-case in mind. RGB is much more memory-consuming so less attractive than YUV, and modern GPUs and display controllers support YUV.
* The post-processor implementation still supports RK3288 only. However, a generic register infrastructure is introduced to make addition of other variants such as RK3399 really easy.
Ezequiel Garcia (4):
media: vidioc-enum-fmt.rst: clarify format preference
media: hantro: Cleanup format negotiation helpers
hantro: Rename {prepare,finish}_run to {start,end}_prepare_run
media: hantro: Support color conversion via post-processing
.../media/uapi/v4l/vidioc-enum-fmt.rst | 4 +- drivers/staging/media/hantro/Makefile | 1 + drivers/staging/media/hantro/hantro.h | 66 +++++++- drivers/staging/media/hantro/hantro_drv.c | 11 +- .../staging/media/hantro/hantro_g1_h264_dec.c | 4 +- .../media/hantro/hantro_g1_mpeg2_dec.c | 6 +- drivers/staging/media/hantro/hantro_g1_regs.h | 53 +++++++ .../staging/media/hantro/hantro_g1_vp8_dec.c | 6 +- .../staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +- drivers/staging/media/hantro/hantro_h264.c | 2 +- drivers/staging/media/hantro/hantro_hw.h | 17 ++- .../staging/media/hantro/hantro_postproc.c | 142 ++++++++++++++++++ drivers/staging/media/hantro/hantro_v4l2.c | 109 +++++++++----- drivers/staging/media/hantro/rk3288_vpu_hw.c | 10 ++ .../media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +- .../media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 4 +- .../media/hantro/rk3399_vpu_hw_vp8_dec.c | 4 +- 17 files changed, 384 insertions(+), 63 deletions(-) create mode 100644 drivers/staging/media/hantro/hantro_postproc.c
Signature · 1 line
2.22.0
PATCH v4 1/4 media: vidioc-enum-fmt.rst: clarify format preference
It has been decided to use the ENUM_FMT index value as a hint for driver preference. This is defined purposedly in a very liberal way, letting drivers define what "preference" means.
For instance, the Hantro VPU driver indicates additional processing to output a given format, and thus implicates more CPU usage, which is enumerated after native (non-processed) formats.
--- Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst +3 -1
@@ -44,7 +44,9 @@ To enumerate image formats applications initialize the ``type`` and the :ref:`VIDIOC_ENUM_FMT` ioctl with a pointer to this structure. Drivers fill the rest of the structure or return an ``EINVAL`` error code. All formats are enumerable by beginning at index zero and incrementing by -one until ``EINVAL`` is returned. +one until ``EINVAL`` is returned. If applicable, drivers shall return +formats in preference order, where preferred formats are returned before +(that is, with lower ``index`` value) less-preferred formats. .. note::
Signature · 1 line
2.22.0
PATCH v4 2/4 media: hantro: Cleanup format negotiation helpers
In reply to Ezequiel GarciaFormat negotiation helpers, hantro_find_format()
and hantro_get_default_fmt() can be simplified,
making the code a little bit clearer.
More importantly, this change is preparation work
for the post-processor usage.
--- drivers/staging/media/hantro/hantro_v4l2.c | 53 ++++++++-------------- 1 file changed, 20 insertions(+), 33 deletions(-)
drivers/staging/media/hantro/hantro_v4l2.c +20 -33
@@ -47,23 +47,26 @@ hantro_get_formats(const struct hantro_ctx *ctx, unsigned int *num_fmts) }static const struct hantro_fmt * -hantro_find_format (const struct hantro_fmt *formats,unsigned int num_fmts, -u32 fourcc) +hantro_find_format (const struct hantro_ctx *ctx,u32 fourcc) { -unsigned int i; +const struct hantro_fmt *formats; +unsigned int i, num_fmts; + formats =hantro_get_formats (ctx, &num_fmts);for (i =0 ; i < num_fmts; i++)if (formats[i].fourcc == fourcc)return &formats[i]; +return NULL ; }static const struct hantro_fmt * -hantro_get_default_fmt (const struct hantro_fmt *formats,unsigned int num_fmts, -bool bitstream) +hantro_get_default_fmt (const struct hantro_ctx *ctx,bool bitstream) { -unsigned int i; +const struct hantro_fmt *formats; +unsigned int i, num_fmts; + formats =hantro_get_formats (ctx, &num_fmts);for (i =0 ; i < num_fmts; i++) {if (bitstream == (formats[i].codec_mode !=HANTRO_MODE_NONE ))
@@ -89,8 +92,7 @@ static int vidioc_enum_framesizes(struct file *file, void *priv, struct v4l2_frmsizeenum *fsize) {struct hantro_ctx *ctx =fh_to_ctx (priv); -const struct hantro_fmt *formats, *fmt; -unsigned int num_fmts; +const struct hantro_fmt *fmt;if (fsize->index !=0 ) { vpu_debug(0, "invalid frame size index (expected 0, got %d)\n",
@@ -98,8 +100,7 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,return -EINVAL ; } - formats =hantro_get_formats (ctx, &num_fmts); - fmt =hantro_find_format (formats, num_fmts, fsize->pixel_format); + fmt =hantro_find_format (ctx, fsize->pixel_format);if (!fmt) {vpu_debug (0 ,"unsupported bitstream format (%08x)\n" , fsize->pixel_format);
@@ -196,8 +197,7 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f, {struct hantro_ctx *ctx =fh_to_ctx (priv);struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; -const struct hantro_fmt *formats, *fmt, *vpu_fmt; -unsigned int num_fmts; +const struct hantro_fmt *fmt, *vpu_fmt;bool coded; coded = capture ==hantro_is_encoder_ctx (ctx);
@@ -208,10 +208,9 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f, (pix_mp->pixelformat >>16 ) &0x7f , (pix_mp->pixelformat >> 24) & 0x7f); - formats =hantro_get_formats (ctx, &num_fmts); - fmt =hantro_find_format (formats, num_fmts, pix_mp->pixelformat); + fmt =hantro_find_format (ctx, pix_mp->pixelformat);if (!fmt) { - fmt =hantro_get_default_fmt (formats, num_fmts, coded); + fmt =hantro_get_default_fmt (ctx, coded); f->fmt.pix_mp.pixelformat = fmt->fourcc; }
@@ -306,12 +305,10 @@ hantro_reset_fmt(struct v4l2_pix_format_mplane *fmt,static void hantro_reset_encoded_fmt (struct hantro_ctx *ctx) { -const struct hantro_fmt *vpu_fmt, *formats; +const struct hantro_fmt *vpu_fmt;struct v4l2_pix_format_mplane *fmt; -unsigned int num_fmts; - formats =hantro_get_formats (ctx, &num_fmts); - vpu_fmt =hantro_get_default_fmt (formats, num_fmts, true); + vpu_fmt =hantro_get_default_fmt (ctx, true);if (hantro_is_encoder_ctx (ctx)) { ctx->vpu_dst_fmt = vpu_fmt;
@@ -332,12 +329,10 @@ hantro_reset_encoded_fmt(struct hantro_ctx *ctx)static void hantro_reset_raw_fmt (struct hantro_ctx *ctx) { -const struct hantro_fmt *raw_vpu_fmt, *formats; +const struct hantro_fmt *raw_vpu_fmt;struct v4l2_pix_format_mplane *raw_fmt, *encoded_fmt; -unsigned int num_fmts; - formats =hantro_get_formats (ctx, &num_fmts); - raw_vpu_fmt =hantro_get_default_fmt (formats, num_fmts, false); + raw_vpu_fmt =hantro_get_default_fmt (ctx, false);if (hantro_is_encoder_ctx (ctx)) { ctx->vpu_src_fmt = raw_vpu_fmt;
@@ -384,8 +379,6 @@ vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f)struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;struct hantro_ctx *ctx =fh_to_ctx (priv);struct vb2_queue *vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, f->type); -const struct hantro_fmt *formats; -unsigned int num_fmts;int ret; ret =vidioc_try_fmt_out_mplane (file, priv, f);
@@ -421,9 +414,7 @@ vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f)return -EBUSY ; } - formats =hantro_get_formats (ctx, &num_fmts); - ctx->vpu_src_fmt =hantro_find_format (formats, num_fmts, - pix_mp->pixelformat); + ctx->vpu_src_fmt =hantro_find_format (ctx, pix_mp->pixelformat); ctx->src_fmt = *pix_mp;/*
@@ -457,9 +448,7 @@ static int vidioc_s_fmt_cap_mplane(struct file *file, void *priv, {struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;struct hantro_ctx *ctx =fh_to_ctx (priv); -const struct hantro_fmt *formats;struct vb2_queue *vq; -unsigned int num_fmts;int ret;/* Change not allowed if queue is busy. */
@@ -488,9 +477,7 @@ static int vidioc_s_fmt_cap_mplane(struct file *file, void *priv,if (ret)return ret; - formats =hantro_get_formats (ctx, &num_fmts); - ctx->vpu_dst_fmt =hantro_find_format (formats, num_fmts, - pix_mp->pixelformat); + ctx->vpu_dst_fmt =hantro_find_format (ctx, pix_mp->pixelformat); ctx->dst_fmt = *pix_mp;/*
Signature · 1 line
2.22.0
PATCH v4 3/4 hantro: Rename {prepare,finish}_run to {start,end}_prepare_run
In reply to Ezequiel Garciahantro_prepare_run() and hantro_finish_run() are slightly misleading, so let's rename it to something a bit more clear.
--- drivers/staging/media/hantro/hantro_drv.c | 4 ++-- drivers/staging/media/hantro/hantro_g1_h264_dec.c | 2 +- drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 4 ++-- drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 4 ++-- drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 ++-- drivers/staging/media/hantro/hantro_h264.c | 2 +- drivers/staging/media/hantro/hantro_hw.h | 4 ++-- drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 ++-- drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 4 ++-- drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/media/hantro/hantro_drv.c +2 -2
@@ -152,7 +152,7 @@ void hantro_watchdog(struct work_struct *work) } } -void hantro_prepare_run (struct hantro_ctx *ctx) +void hantro_start_prepare_run (struct hantro_ctx *ctx) {struct vb2_v4l2_buffer *src_buf;
@@ -161,7 +161,7 @@ void hantro_prepare_run(struct hantro_ctx *ctx) &ctx->ctrl_handler); } -void hantro_finish_run (struct hantro_ctx *ctx) +void hantro_end_prepare_run (struct hantro_ctx *ctx) {struct vb2_v4l2_buffer *src_buf;
drivers/staging/media/hantro/hantro_g1_h264_dec.c +1 -1
@@ -288,7 +288,7 @@ void hantro_g1_h264_dec_run(struct hantro_ctx *ctx)set_ref (ctx);set_buffers (ctx); -hantro_finish_run (ctx); +hantro_end_prepare_run (ctx);/* Start decoding! */ vdpu_write_relaxed(vpu,
drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c +2 -2
@@ -168,7 +168,7 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx) dst_buf =hantro_get_dst_buf (ctx);/* Apply request controls if any */ -hantro_prepare_run (ctx); +hantro_start_prepare_run (ctx); slice_params =hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS );
@@ -244,7 +244,7 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx) &dst_buf->vb2_buf, sequence, picture, slice_params); -hantro_finish_run (ctx); +hantro_end_prepare_run (ctx); reg =G1_REG_DEC_E (1 );vdpu_write (vpu, reg,G1_SWREG (1 ));
drivers/staging/media/hantro/hantro_g1_vp8_dec.c +2 -2
@@ -435,7 +435,7 @@ void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)u32 mb_width, mb_height;u32 reg; -hantro_prepare_run (ctx); +hantro_start_prepare_run (ctx); hdr =hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER );if (WARN_ON (!hdr))
@@ -496,7 +496,7 @@ void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)cfg_ref (ctx, hdr);cfg_buffers (ctx, hdr); -hantro_finish_run (ctx); +hantro_end_prepare_run (ctx);vdpu_write (vpu,G1_REG_INTERRUPT_DEC_E ,G1_REG_INTERRUPT ); }
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c +2 -2
@@ -87,7 +87,7 @@ void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx) src_buf =hantro_get_src_buf (ctx); dst_buf =hantro_get_dst_buf (ctx); -hantro_prepare_run (ctx); +hantro_start_prepare_run (ctx);memset (&jpeg_ctx,0 ,sizeof (jpeg_ctx)); jpeg_ctx.buffer =vb2_plane_vaddr (&dst_buf->vb2_buf,0 );
@@ -122,7 +122,7 @@ void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx) | H1_REG_ENC_PIC_INTRA |H1_REG_ENC_CTRL_EN_BIT ; -hantro_finish_run (ctx); +hantro_end_prepare_run (ctx);vepu_write (vpu, reg,H1_REG_ENC_CTRL ); }
drivers/staging/media/hantro/hantro_h264.c +1 -1
@@ -562,7 +562,7 @@ int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx)struct hantro_h264_dec_ctrls *ctrls = &h264_ctx->ctrls;struct hantro_h264_reflist_builder reflist_builder; -hantro_prepare_run (ctx); +hantro_start_prepare_run (ctx); ctrls->scaling =hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX );
drivers/staging/media/hantro/hantro_hw.h +2 -2
@@ -147,8 +147,8 @@ void hantro_watchdog(struct work_struct *work);void hantro_run (struct hantro_ctx *ctx);void hantro_irq_done (struct hantro_dev *vpu,unsigned int bytesused,enum vb2_buffer_state result); -void hantro_prepare_run (struct hantro_ctx *ctx); -void hantro_finish_run (struct hantro_ctx *ctx); +void hantro_start_prepare_run (struct hantro_ctx *ctx); +void hantro_end_prepare_run (struct hantro_ctx *ctx);void hantro_h1_jpeg_enc_run (struct hantro_ctx *ctx);void rk3399_vpu_jpeg_enc_run (struct hantro_ctx *ctx);
drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c +2 -2
@@ -118,7 +118,7 @@ void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx) src_buf =hantro_get_src_buf (ctx); dst_buf =hantro_get_dst_buf (ctx); -hantro_prepare_run (ctx); +hantro_start_prepare_run (ctx);memset (&jpeg_ctx,0 ,sizeof (jpeg_ctx)); jpeg_ctx.buffer =vb2_plane_vaddr (&dst_buf->vb2_buf,0 );
@@ -156,6 +156,6 @@ void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx) | VEPU_REG_ENCODE_ENABLE;/* Kick the watchdog and start encoding */ -hantro_finish_run (ctx); +hantro_end_prepare_run (ctx);vepu_write (vpu, reg,VEPU_REG_ENCODE_START ); }
drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c +2 -2
@@ -169,7 +169,7 @@ void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx) src_buf =hantro_get_src_buf (ctx); dst_buf =hantro_get_dst_buf (ctx); -hantro_prepare_run (ctx); +hantro_start_prepare_run (ctx); slice_params =hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS );
@@ -250,7 +250,7 @@ void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx) sequence, picture, slice_params);/* Kick the watchdog and start decoding */ -hantro_finish_run (ctx); +hantro_end_prepare_run (ctx); reg =vdpu_read (vpu,VDPU_SWREG (57 )) |VDPU_REG_DEC_E (1 );vdpu_write (vpu, reg,VDPU_SWREG (57 ));
drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c +2 -2
@@ -513,7 +513,7 @@ void rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx)u32 mb_width, mb_height;u32 reg; -hantro_prepare_run (ctx); +hantro_start_prepare_run (ctx); hdr =hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER );if (WARN_ON (!hdr))
@@ -587,7 +587,7 @@ void rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx)cfg_ref (ctx, hdr);cfg_buffers (ctx, hdr); -hantro_finish_run (ctx); +hantro_end_prepare_run (ctx);hantro_reg_write (vpu, &vp8_dec_start_dec,1 ); }
Signature · 1 line
2.22.0
PATCH v4 4/4 media: hantro: Support color conversion via post-processing
In reply to Ezequiel GarciaThe Hantro G1 decoder is able to enable a post-processor on the decoding pipeline, which can be used to perform scaling and color conversion.
The post-processor is integrated to the decoder, and it's possible to use it in a way that is completely transparent to the user.
This commit enables color conversion via post-processing, which means the driver now exposes YUV packed, in addition to NV12.
--- drivers/staging/media/hantro/Makefile | 1 + drivers/staging/media/hantro/hantro.h | 66 +++++++- drivers/staging/media/hantro/hantro_drv.c | 7 +- .../staging/media/hantro/hantro_g1_h264_dec.c | 2 +- .../media/hantro/hantro_g1_mpeg2_dec.c | 2 +- drivers/staging/media/hantro/hantro_g1_regs.h | 53 +++++++ .../staging/media/hantro/hantro_g1_vp8_dec.c | 2 +- drivers/staging/media/hantro/hantro_hw.h | 13 ++ .../staging/media/hantro/hantro_postproc.c | 142 ++++++++++++++++++ drivers/staging/media/hantro/hantro_v4l2.c | 56 ++++++- drivers/staging/media/hantro/rk3288_vpu_hw.c | 10 ++ 11 files changed, 343 insertions(+), 11 deletions(-) create mode 100644 drivers/staging/media/hantro/hantro_postproc.c
drivers/staging/media/hantro/Makefile +1 -0
@@ -3,6 +3,7 @@ obj-$(CONFIG_VIDEO_HANTRO) += hantro-vpu.o hantro-vpu-y += \ hantro_drv.o \ hantro_v4l2.o \ + hantro_postproc.o \ hantro_h1_jpeg_enc.o \ hantro_g1_h264_dec.o \ hantro_g1_mpeg2_dec.o \
drivers/staging/media/hantro/hantro.h +62 -4
124 lines not on this page · raw message
drivers/staging/media/hantro/hantro_drv.c +6 -1
@@ -53,7 +53,7 @@ dma_addr_t hantro_get_ref(struct hantro_ctx *ctx, u64 ts)if (index <0 )return 0 ; buf =vb2_get_buffer (q, index); -return vb2_dma_contig_plane_dma_addr (buf,0 ); +return hantro_get_dec_buf_addr (ctx, buf); } static int
@@ -159,6 +159,11 @@ void hantro_start_prepare_run(struct hantro_ctx *ctx) src_buf =hantro_get_src_buf (ctx);v4l2_ctrl_request_setup (src_buf->vb2_buf.req_obj.req, &ctx->ctrl_handler); + +if (hantro_needs_postproc (ctx, ctx->vpu_dst_fmt)) +hantro_postproc_enable (ctx); +else +hantro_postproc_disable (ctx); }void hantro_end_prepare_run (struct hantro_ctx *ctx)
drivers/staging/media/hantro/hantro_g1_h264_dec.c +1 -1
@@ -244,7 +244,7 @@ static void set_buffers(struct hantro_ctx *ctx)vdpu_write_relaxed (vpu, src_dma,G1_REG_ADDR_STR );/* Destination (decoded frame) buffer. */ - dst_dma =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); + dst_dma =hantro_get_dec_buf_addr (ctx, &dst_buf->vb2_buf);/* Adjust dma addr to start at second line for bottom field */ if (ctrls->slices[0 ].flags &V4L2_H264_SLICE_FLAG_BOTTOM_FIELD ) offset =ALIGN (ctx->src_fmt.width,MB_DIM );
drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c +1 -1
@@ -121,7 +121,7 @@ hantro_g1_mpeg2_dec_set_buffers(struct hantro_dev *vpu, struct hantro_ctx *ctx,vdpu_write_relaxed (vpu, addr,G1_REG_RLC_VLC_BASE );/* Destination frame buffer */ - addr =vb2_dma_contig_plane_dma_addr (dst_buf,0 ); + addr =hantro_get_dec_buf_addr (ctx, dst_buf); current_addr = addr;if (picture->picture_structure ==PICT_BOTTOM_FIELD )
drivers/staging/media/hantro/hantro_g1_regs.h +53 -0
63 lines not on this page · raw message
drivers/staging/media/hantro/hantro_g1_vp8_dec.c +1 -1
@@ -422,7 +422,7 @@ static void cfg_buffers(struct hantro_ctx *ctx, }vdpu_write_relaxed (vpu, reg,G1_REG_FWD_PIC (0 )); - dst_dma =vb2_dma_contig_plane_dma_addr (&vb2_dst->vb2_buf,0 ); + dst_dma =hantro_get_dec_buf_addr (ctx, &vb2_dst->vb2_buf);vdpu_write_relaxed (vpu, dst_dma,G1_REG_ADDR_DST ); }
drivers/staging/media/hantro/hantro_hw.h +13 -0
@@ -28,11 +28,13 @@ struct hantro_variant;* @cpu: CPU pointer to the buffer. * @dma: DMA address of the buffer. * @size: Size of the buffer. +* @attrs: Attributes of the DMA mapping. */ struct hantro_aux_buf {void *cpu;dma_addr_t dma;size_t size; +unsigned long attrs; };/**
@@ -106,6 +108,15 @@ struct hantro_vp8_dec_hw_ctx {struct hantro_aux_buf prob_tbl; }; +/** +* struct hantro_postproc_ctx +* +* @dec_q: References buffers, in decoder format. +*/ +struct hantro_postproc_ctx { +struct hantro_aux_buf dec_q[VB2_MAX_FRAME ]; +}; +/** * struct hantro_codec_ops - codec mode specific operations *
@@ -141,6 +152,8 @@ extern const struct hantro_variant rk3399_vpu_variant;extern const struct hantro_variant rk3328_vpu_variant;extern const struct hantro_variant rk3288_vpu_variant; +extern const struct hantro_postproc_regs hantro_g1_postproc_regs; +extern const u32 hantro_vp8_dec_mc_filter[8 ][6 ];void hantro_watchdog (struct work_struct *work);
drivers/staging/media/hantro/hantro_postproc.c new file +142 -0
142 lines not on this page · raw message
drivers/staging/media/hantro/hantro_v4l2.c +53 -3
101 lines not on this page · raw message
drivers/staging/media/hantro/rk3288_vpu_hw.c +10 -0
@@ -56,6 +56,13 @@ static const struct hantro_fmt rk3288_vpu_enc_fmts[] = { }, }; +static const struct hantro_fmt rk3288_vpu_postproc_fmts[] = { + { + .fourcc =V4L2_PIX_FMT_YUYV , + .codec_mode =HANTRO_MODE_NONE , + }, +}; +static const struct hantro_fmt rk3288_vpu_dec_fmts[] = { { .fourcc =V4L2_PIX_FMT_NV12 ,
@@ -215,6 +222,9 @@ const struct hantro_variant rk3288_vpu_variant = { .dec_offset = 0x400, .dec_fmts = rk3288_vpu_dec_fmts, .num_dec_fmts = ARRAY_SIZE(rk3288_vpu_dec_fmts), + .postproc_fmts = rk3288_vpu_postproc_fmts, + .num_postproc_fmts = ARRAY_SIZE(rk3288_vpu_postproc_fmts), + .postproc_regs = &hantro_g1_postproc_regs, .codec =HANTRO_JPEG_ENCODER |HANTRO_MPEG2_DECODER | HANTRO_VP8_DECODER | HANTRO_H264_DECODER, .codec_ops = rk3288_vpu_codec_ops,
Signature · 1 line
2.22.0