Commit a3a2efca authored by Ming Qian's avatar Ming Qian Committed by Mauro Carvalho Chehab
Browse files

media: amphion: return error if format is unsupported by vpu 



return error if format is unsupported by vpu,
otherwise the vpu will be stalled at decoding

Fixes: 3cd08451 ("media: amphion: add vpu v4l2 m2m support")
Signed-off-by: default avatarMing Qian <ming.qian@nxp.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent b99bea15

drivers/media/platform/amphion/vpu_malone.c

+2 −0
Original line number Diff line number Diff line
@@ -626,6 +626,8 @@ static int vpu_malone_set_params(struct vpu_shared_addr *shared, 
	enum vpu_malone_format malone_format;



	malone_format = vpu_malone_format_remap(params->codec_format);

	if (WARN_ON(malone_format == MALONE_FMT_NULL))

		return -EINVAL;

	iface->udata_buffer[instance].base = params->udata.base;

	iface->udata_buffer[instance].slot_size = params->udata.size;

drivers/media/platform/amphion/vpu_v4l2.c

+4 −2
Original line number Diff line number Diff line
@@ -500,10 +500,12 @@ static int vpu_vb2_start_streaming(struct vb2_queue *q, unsigned int count) 
		  fmt->sizeimage[1], fmt->bytesperline[1],

		  fmt->sizeimage[2], fmt->bytesperline[2],

		  q->num_buffers);

	call_void_vop(inst, start, q->type);

	ret = call_vop(inst, start, q->type);

	vb2_clear_last_buffer_dequeued(q);

	if (ret)

		vpu_vb2_buffers_return(inst, q->type, VB2_BUF_STATE_QUEUED);



	return 0;

	return ret;

}



static void vpu_vb2_stop_streaming(struct vb2_queue *q)