From: Ezequiel Garcia <ezequiel@collabora.com>
To: Benjamin Gaignard <benjamin.gaignard@collabora.com>,
p.zabel@pengutronix.de, mchehab@kernel.org, robh+dt@kernel.org,
shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com,
lee.jones@linaro.org, gregkh@linuxfoundation.org,
mripard@kernel.org, paul.kocialkowski@bootlin.com,
wens@csie.org, jernej.skrabec@siol.net,
hverkuil-cisco@xs4all.nl, emil.l.velikov@gmail.com
Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-imx@nxp.com, kernel@pengutronix.de, kernel@collabora.com,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: Re: [PATCH v7 06/13] media: hantro: change hantro_codec_ops run prototype to return errors
Date: Mon, 29 Mar 2021 16:27:59 -0300 [thread overview]
Message-ID: <88580a6167df412c272e0af34078dcbebb66ab6c.camel@collabora.com> (raw)
In-Reply-To: <20210329065743.11961-7-benjamin.gaignard@collabora.com>
On Mon, 2021-03-29 at 08:57 +0200, Benjamin Gaignard wrote:
> Change hantro_codec_ops run prototype from 'void' to 'int'.
> This allow to cancel the job if an error occur while configuring
> the hardware.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
> ---
> version 5:
> - forward hantro_h264_dec_prepare_run() return value in case
> of error
>
> drivers/staging/media/hantro/hantro_drv.c | 4 +++-
> .../staging/media/hantro/hantro_g1_h264_dec.c | 10 +++++++---
> .../media/hantro/hantro_g1_mpeg2_dec.c | 4 +++-
> .../staging/media/hantro/hantro_g1_vp8_dec.c | 6 ++++--
> .../staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +++-
> drivers/staging/media/hantro/hantro_hw.h | 19 ++++++++++---------
> .../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 | 6 ++++--
> 9 files changed, 40 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
> index 595e82a82728..02c5c2f1a88b 100644
> --- a/drivers/staging/media/hantro/hantro_drv.c
> +++ b/drivers/staging/media/hantro/hantro_drv.c
> @@ -161,7 +161,9 @@ static void device_run(void *priv)
>
> v4l2_m2m_buf_copy_metadata(src, dst, true);
>
> - ctx->codec_ops->run(ctx);
> + if (ctx->codec_ops->run(ctx))
> + goto err_cancel_job;
> +
> return;
>
> err_cancel_job:
> diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> index 845bef73d218..5c792b7bcb79 100644
> --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> @@ -273,13 +273,15 @@ static void set_buffers(struct hantro_ctx *ctx)
> vdpu_write_relaxed(vpu, ctx->h264_dec.priv.dma, G1_REG_ADDR_QTABLE);
> }
>
> -void hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
> +int hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
> {
> struct hantro_dev *vpu = ctx->dev;
> + int ret;
>
> /* Prepare the H264 decoder context. */
> - if (hantro_h264_dec_prepare_run(ctx))
> - return;
> + ret = hantro_h264_dec_prepare_run(ctx);
> + if (ret)
> + return ret;
>
> /* Configure hardware registers. */
> set_params(ctx);
> @@ -301,4 +303,6 @@ void hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
> G1_REG_CONFIG_DEC_CLK_GATE_E,
> G1_REG_CONFIG);
> vdpu_write(vpu, G1_REG_INTERRUPT_DEC_E, G1_REG_INTERRUPT);
> +
> + return 0;
> }
> diff --git a/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c b/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c
> index 6386a3989bfe..5e8943d31dc5 100644
> --- a/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c
> +++ b/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c
> @@ -155,7 +155,7 @@ hantro_g1_mpeg2_dec_set_buffers(struct hantro_dev *vpu, struct hantro_ctx *ctx,
> vdpu_write_relaxed(vpu, backward_addr, G1_REG_REFER3_BASE);
> }
>
> -void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx)
> +int hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx)
> {
> struct hantro_dev *vpu = ctx->dev;
> struct vb2_v4l2_buffer *src_buf, *dst_buf;
> @@ -248,4 +248,6 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx)
>
> reg = G1_REG_DEC_E(1);
> vdpu_write(vpu, reg, G1_SWREG(1));
> +
> + return 0;
> }
> diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
> index 57002ba70176..96622a7f8279 100644
> --- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
> +++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
> @@ -425,7 +425,7 @@ static void cfg_buffers(struct hantro_ctx *ctx,
> vdpu_write_relaxed(vpu, dst_dma, G1_REG_ADDR_DST);
> }
>
> -void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
> +int hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
> {
> const struct v4l2_ctrl_vp8_frame *hdr;
> struct hantro_dev *vpu = ctx->dev;
> @@ -438,7 +438,7 @@ void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
>
> hdr = hantro_get_ctrl(ctx, V4L2_CID_STATELESS_VP8_FRAME);
> if (WARN_ON(!hdr))
> - return;
> + return -EINVAL;
>
> /* Reset segment_map buffer in keyframe */
> if (V4L2_VP8_FRAME_IS_KEY_FRAME(hdr) && ctx->vp8_dec.segment_map.cpu)
> @@ -498,4 +498,6 @@ void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
> hantro_end_prepare_run(ctx);
>
> vdpu_write(vpu, G1_REG_INTERRUPT_DEC_E, G1_REG_INTERRUPT);
> +
> + return 0;
> }
> diff --git a/drivers/staging/media/hantro/hantro_h1_jpeg_enc.c b/drivers/staging/media/hantro/hantro_h1_jpeg_enc.c
> index b88dc4ed06db..56cf261a8e95 100644
> --- a/drivers/staging/media/hantro/hantro_h1_jpeg_enc.c
> +++ b/drivers/staging/media/hantro/hantro_h1_jpeg_enc.c
> @@ -88,7 +88,7 @@ hantro_h1_jpeg_enc_set_qtable(struct hantro_dev *vpu,
> }
> }
>
> -void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx)
> +int hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx)
> {
> struct hantro_dev *vpu = ctx->dev;
> struct vb2_v4l2_buffer *src_buf, *dst_buf;
> @@ -136,6 +136,8 @@ void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx)
> hantro_end_prepare_run(ctx);
>
> vepu_write(vpu, reg, H1_REG_ENC_CTRL);
> +
> + return 0;
> }
>
> void hantro_jpeg_enc_done(struct hantro_ctx *ctx)
> diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
> index 13a6e7113001..a76852966578 100644
> --- a/drivers/staging/media/hantro/hantro_hw.h
> +++ b/drivers/staging/media/hantro/hantro_hw.h
> @@ -126,14 +126,15 @@ struct hantro_postproc_ctx {
> * Optional and called from process context.
> * @run: Start single {en,de)coding job. Called from atomic context
> * to indicate that a pair of buffers is ready and the hardware
> - * should be programmed and started.
> + * should be programmed and started. Returns zero if OK, a
> + * negative value in error cases.
> * @done: Read back processing results and additional data from hardware.
> * @reset: Reset the hardware in case of a timeout.
> */
> struct hantro_codec_ops {
> int (*init)(struct hantro_ctx *ctx);
> void (*exit)(struct hantro_ctx *ctx);
> - void (*run)(struct hantro_ctx *ctx);
> + int (*run)(struct hantro_ctx *ctx);
> void (*done)(struct hantro_ctx *ctx);
> void (*reset)(struct hantro_ctx *ctx);
> };
> @@ -164,8 +165,8 @@ void hantro_irq_done(struct hantro_dev *vpu,
> 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);
> +int hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx);
> +int rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx);
> int hantro_jpeg_enc_init(struct hantro_ctx *ctx);
> void hantro_jpeg_enc_exit(struct hantro_ctx *ctx);
> void hantro_jpeg_enc_done(struct hantro_ctx *ctx);
> @@ -173,7 +174,7 @@ void hantro_jpeg_enc_done(struct hantro_ctx *ctx);
> dma_addr_t hantro_h264_get_ref_buf(struct hantro_ctx *ctx,
> unsigned int dpb_idx);
> int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx);
> -void hantro_g1_h264_dec_run(struct hantro_ctx *ctx);
> +int hantro_g1_h264_dec_run(struct hantro_ctx *ctx);
> int hantro_h264_dec_init(struct hantro_ctx *ctx);
> void hantro_h264_dec_exit(struct hantro_ctx *ctx);
>
> @@ -204,15 +205,15 @@ hantro_h264_mv_size(unsigned int width, unsigned int height)
> return 64 * MB_WIDTH(width) * MB_WIDTH(height) + 32;
> }
>
> -void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx);
> -void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx);
> +int hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx);
> +int rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx);
> void hantro_mpeg2_dec_copy_qtable(u8 *qtable,
> const struct v4l2_ctrl_mpeg2_quantization *ctrl);
> int hantro_mpeg2_dec_init(struct hantro_ctx *ctx);
> void hantro_mpeg2_dec_exit(struct hantro_ctx *ctx);
>
> -void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx);
> -void rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx);
> +int hantro_g1_vp8_dec_run(struct hantro_ctx *ctx);
> +int rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx);
> int hantro_vp8_dec_init(struct hantro_ctx *ctx);
> void hantro_vp8_dec_exit(struct hantro_ctx *ctx);
> void hantro_vp8_prob_update(struct hantro_ctx *ctx,
> diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c b/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c
> index 3498e6124acd..3a27ebef4f38 100644
> --- a/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c
> +++ b/drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c
> @@ -118,7 +118,7 @@ rk3399_vpu_jpeg_enc_set_qtable(struct hantro_dev *vpu,
> }
> }
>
> -void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx)
> +int rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx)
> {
> struct hantro_dev *vpu = ctx->dev;
> struct vb2_v4l2_buffer *src_buf, *dst_buf;
> @@ -168,4 +168,6 @@ void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx)
> /* Kick the watchdog and start encoding */
> hantro_end_prepare_run(ctx);
> vepu_write(vpu, reg, VEPU_REG_ENCODE_START);
> +
> + return 0;
> }
> diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c
> index f610fa5b4335..4bd3080abbc1 100644
> --- a/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c
> +++ b/drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c
> @@ -157,7 +157,7 @@ rk3399_vpu_mpeg2_dec_set_buffers(struct hantro_dev *vpu,
> vdpu_write_relaxed(vpu, backward_addr, VDPU_REG_REFER3_BASE);
> }
>
> -void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx)
> +int rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx)
> {
> struct hantro_dev *vpu = ctx->dev;
> struct vb2_v4l2_buffer *src_buf, *dst_buf;
> @@ -254,4 +254,6 @@ void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx)
>
> reg = vdpu_read(vpu, VDPU_SWREG(57)) | VDPU_REG_DEC_E(1);
> vdpu_write(vpu, reg, VDPU_SWREG(57));
> +
> + return 0;
> }
> diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
> index 8661a3cc1e6b..e5d20fe5b007 100644
> --- a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
> +++ b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
> @@ -503,7 +503,7 @@ static void cfg_buffers(struct hantro_ctx *ctx,
> vdpu_write_relaxed(vpu, dst_dma, VDPU_REG_ADDR_DST);
> }
>
> -void rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx)
> +int rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx)
> {
> const struct v4l2_ctrl_vp8_frame *hdr;
> struct hantro_dev *vpu = ctx->dev;
> @@ -516,7 +516,7 @@ void rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx)
>
> hdr = hantro_get_ctrl(ctx, V4L2_CID_STATELESS_VP8_FRAME);
> if (WARN_ON(!hdr))
> - return;
> + return -EINVAL;
>
> /* Reset segment_map buffer in keyframe */
> if (V4L2_VP8_FRAME_IS_KEY_FRAME(hdr) && ctx->vp8_dec.segment_map.cpu)
> @@ -589,4 +589,6 @@ void rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx)
> hantro_end_prepare_run(ctx);
>
> hantro_reg_write(vpu, &vp8_dec_start_dec, 1);
> +
> + return 0;
> }
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2021-03-29 19:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 6:57 [PATCH v7 00/13] Add HANTRO G2/HEVC decoder support for IMX8MQ Benjamin Gaignard
2021-03-29 6:57 ` [PATCH v7 01/13] dt-bindings: mfd: Add 'nxp, imx8mq-vpu-ctrl' to syscon list Benjamin Gaignard
2021-03-29 7:46 ` [PATCH v7 01/13] dt-bindings: mfd: Add 'nxp,imx8mq-vpu-ctrl' " Lee Jones
2021-03-29 6:57 ` [PATCH v7 02/13] dt-bindings: media: nxp, imx8mq-vpu: Update the bindings for G2 support Benjamin Gaignard
2021-03-29 6:57 ` [PATCH v7 03/13] media: hantro: Use syscon instead of 'ctrl' register Benjamin Gaignard
2021-03-29 6:57 ` [PATCH v7 04/13] media: hevc: Add fields and flags for hevc PPS Benjamin Gaignard
2021-03-29 19:27 ` Ezequiel Garcia
2021-03-29 6:57 ` [PATCH v7 05/13] media: hevc: Add decode params control Benjamin Gaignard
2021-03-29 19:27 ` Ezequiel Garcia
2021-03-29 6:57 ` [PATCH v7 06/13] media: hantro: change hantro_codec_ops run prototype to return errors Benjamin Gaignard
2021-03-29 19:27 ` Ezequiel Garcia [this message]
2021-03-29 6:57 ` [PATCH v7 07/13] media: hantro: Define HEVC codec profiles and supported features Benjamin Gaignard
2021-03-29 19:28 ` Ezequiel Garcia
2021-03-29 6:57 ` [PATCH v7 08/13] media: hantro: Only use postproc when post processed formats are defined Benjamin Gaignard
2021-03-29 19:28 ` Ezequiel Garcia
2021-03-29 6:57 ` [PATCH v7 09/13] media: uapi: Add a control for HANTRO driver Benjamin Gaignard
2021-03-29 6:57 ` [PATCH v7 10/13] media: hantro: handle V4L2_PIX_FMT_HEVC_SLICE control Benjamin Gaignard
2021-03-29 19:28 ` Ezequiel Garcia
2021-03-29 6:57 ` [PATCH v7 11/13] media: hantro: Introduce G2/HEVC decoder Benjamin Gaignard
2021-03-29 6:57 ` [PATCH v7 12/13] media: hantro: IMX8M: add variant for G2/HEVC codec Benjamin Gaignard
2021-03-29 19:29 ` Ezequiel Garcia
2021-03-29 6:57 ` [PATCH v7 13/13] arm64: dts: imx8mq: Add node to G2 hardware Benjamin Gaignard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88580a6167df412c272e0af34078dcbebb66ab6c.camel@collabora.com \
--to=ezequiel@collabora.com \
--cc=benjamin.gaignard@collabora.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=emil.l.velikov@gmail.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jernej.skrabec@siol.net \
--cc=kernel@collabora.com \
--cc=kernel@pengutronix.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=paul.kocialkowski@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).