Commit 42cb2a8f authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: hantro: change hantro_codec_ops run prototype to return errors 



Change hantro_codec_ops run prototype from 'void' to 'int'.
This allows the driver to cancel the job if an error occurs while configuring
the hardware.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d395a78d

drivers/staging/media/hantro/hantro_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -170,7 +170,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:

drivers/staging/media/hantro/hantro_g1_h264_dec.c

+7 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,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;
@@ -235,4 +235,6 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx) 
	hantro_end_prepare_run(ctx);



	vdpu_write(vpu, G1_REG_INTERRUPT_DEC_E, G1_REG_INTERRUPT);



	return 0;

}

drivers/staging/media/hantro/hantro_g1_vp8_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/media/hantro/hantro_h1_jpeg_enc.c

+3 −1
Original line number Diff line number Diff line
@@ -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)