From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0ADBCDB482 for ; Tue, 17 Oct 2023 22:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wgKb2MgRyFcEulziGmjsnuF86gPsfIR9efUJWqWVoTU=; b=q6NHaD6SWCOqLq RBT4dHEOeT8ShCq6uOV5PFSZDDTCLV3qcjRA8I5z8ZCr7TMMCGyjd6eBpoSYc+E3ZCymRQunu5++4 cLJM2RaseYdof1kr3EJqd9aDGKMx7uMZuS182Zv2T1sXVjTN4Ad1jkIrv0LjjMn3ynjBR53EzvQMB wycFD7064CSPdyvR1aAwro0SB3V6yDKdO+xtAc2nkljqA/pDGkPJs4MyNS0FqSDLtUtK+lQGOWx94 9KFdebhVKaYYWzCNfoWwcXj4hun+FFDJzPabmAQqbdWkSgJqeVknVY8MfUE3uXR62oGYvCRX2h2U2 tnRh4g5MfFUwaCduAlWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qssL7-00DLMy-2R; Tue, 17 Oct 2023 22:15:01 +0000 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qssL0-00DLLM-0O for linux-arm-kernel@lists.infradead.org; Tue, 17 Oct 2023 22:14:56 +0000 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2c501bd6ff1so71045651fa.3 for ; Tue, 17 Oct 2023 15:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697580890; x=1698185690; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zOAltFmNIIk1OQ8RE29YlbSsDwGFJQEW4YapJi7YEcE=; b=M8Pca95yyYzcjcKuYPzwNfyDiDEHBnCX4nHdy3Y1L8dOulAHBUHthmgzpD1Y8vL+b9 fi80l3SefsRP+sfUSDNlqM9BQYlTiTKZBpY11EGeV/eSDa3W9r2sAHM9p6R8glwqcwkE gmfcjqyT54YnigbOBxs6ickaNdd+FTrnT21tI32nMJgNTDP8JVO3kIfPeT1j3TkbP21a JKF1DOp53gawkuu7Q4sIqsBE1fuJso4KFEHGAPOc3A9xzkwrwsBnz9Lf8fY1S88MtXlb rzX4IiRs0wt+2jMesRikXx1Kw5uRs1mRGRNpFKErjEo4lcJWkZdvpN/aQySOPiVXrxml timw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697580890; x=1698185690; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zOAltFmNIIk1OQ8RE29YlbSsDwGFJQEW4YapJi7YEcE=; b=TDhXJinW5iNj3wO+1zHbASPXzqKkxya6BmQgjHxZTawVzJrWfQS+xCwftA17K8AAtZ ihla91hXsmWJCcw1xanDW1/tN+zLJ5a8V6pAAQVfY+PBiBmU6owtfGwleWtpJQmQ3Fab 7x1oYWz62jpiSMzO5W9GPgI5P46ayHdqSPn7vWepQ/Rs1DX3Nj2DLxOwKV9t8KMq8rAH zohbkTtT0ZfRe7FgeeYSZywuK1gnO1etKCwmd33J2eD3bdxTHi541NogTbh/WozJ1Ifg ptt6RI9wKgl9AcLb3fHlBNAp6yoQXa/do824gchIoS8VVyMEFVL+DwqrLXZQo82+yoej d6hg== X-Gm-Message-State: AOJu0Yy4jU1b7xQeYJ745tGl6UqzUnG2J1JK8mdQPw89PqwVQ03PrfAj vRbrXhVbygUdHJV4SK7ItQs= X-Google-Smtp-Source: AGHT+IEOpr6BB0LyNnV+m0noVjJYZ0i8J9qyJIrlwMfaZvC5GGftq5mVNUekH40+/BfvoXTTd9ds7g== X-Received: by 2002:a2e:8e22:0:b0:2b6:a804:4cc with SMTP id r2-20020a2e8e22000000b002b6a80404ccmr2153096ljk.53.1697580889428; Tue, 17 Oct 2023 15:14:49 -0700 (PDT) Received: from localhost.localdomain ([178.70.169.129]) by smtp.gmail.com with ESMTPSA id d13-20020a2eb04d000000b002c09602150asm431479ljl.27.2023.10.17.15.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 15:14:48 -0700 (PDT) From: Ivan Bornyakov To: Sebastian Fricke Cc: Ivan Bornyakov , Krzysztof Kozlowski , NXP Linux Team , Conor Dooley , Mauro Carvalho Chehab , Jackson Lee , Hans Verkuil , Sascha Hauer , Rob Herring , Pengutronix Kernel Team , Shawn Guo , Philipp Zabel , Nas Chung , Fabio Estevam , linux-media@vger.kernel.org, Tomasz Figa , linux-kernel@vger.kernel.org, Nicolas Dufresne , kernel@collabora.com, Robert Beckett , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Darren Etheridge Subject: Re: [PATCH v13 5/8] media: chips-media: wave5: Add the v4l2 layer Date: Wed, 18 Oct 2023 01:13:52 +0300 Message-ID: <20231017221359.20164-1-brnkv.i1@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230929-wave5_v13_media_master-v13-5-5ac60ccbf2ce@collabora.com> References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_151454_177515_21EC8EC5 X-CRM114-Status: GOOD ( 27.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi! On Thu, 12 Oct 2023 13:01:03 +0200, Sebastian Fricke wrote: > Add the decoder and encoder implementing the v4l2 > API. This patch also adds the Makefile and the VIDEO_WAVE_VPU config > > Signed-off-by: Sebastian Fricke > Signed-off-by: Nicolas Dufresne > Signed-off-by: Deborah Brouwer > Signed-off-by: Robert Beckett > Signed-off-by: Dafna Hirschfeld > Signed-off-by: Nas Chung > --- > drivers/media/platform/chips-media/Kconfig | 1 + > drivers/media/platform/chips-media/Makefile | 1 + > drivers/media/platform/chips-media/wave5/Kconfig | 12 + > drivers/media/platform/chips-media/wave5/Makefile | 10 + > .../platform/chips-media/wave5/wave5-helper.c | 213 +++ > .../platform/chips-media/wave5/wave5-helper.h | 31 + > .../platform/chips-media/wave5/wave5-vpu-dec.c | 1953 ++++++++++++++++++++ > .../platform/chips-media/wave5/wave5-vpu-enc.c | 1794 ++++++++++++++++++ > .../media/platform/chips-media/wave5/wave5-vpu.c | 291 +++ > .../media/platform/chips-media/wave5/wave5-vpu.h | 83 + > .../platform/chips-media/wave5/wave5-vpuapi.h | 2 - > 11 files changed, 4389 insertions(+), 2 deletions(-) [...] > diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c > new file mode 100644 > index 000000000000..74d1fae64fa4 > --- /dev/null > +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c [...] > +static int wave5_vpu_dec_queue_setup(struct vb2_queue *q, unsigned int *num_buffers, > + unsigned int *num_planes, unsigned int sizes[], > + struct device *alloc_devs[]) > +{ > + struct vpu_instance *inst = vb2_get_drv_priv(q); > + struct v4l2_pix_format_mplane inst_format = > + (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) ? inst->src_fmt : inst->dst_fmt; > + unsigned int i; > + > + dev_dbg(inst->dev->dev, "%s: num_buffers: %u | num_planes: %u | type: %u\n", __func__, > + *num_buffers, *num_planes, q->type); > + > + /* the CREATE_BUFS case */ > + if (*num_planes) { > + if (inst_format.num_planes != *num_planes) > + return -EINVAL; > + > + for (i = 0; i < *num_planes; i++) { > + if (sizes[i] < inst_format.plane_fmt[i].sizeimage) > + return -EINVAL; > + } > + /* the REQBUFS case */ > + } else { > + *num_planes = inst_format.num_planes; > + > + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { > + sizes[0] = inst_format.plane_fmt[0].sizeimage; > + dev_dbg(inst->dev->dev, "%s: size[0]: %u\n", __func__, sizes[0]); > + } else if (*num_planes == 1) { I think, you should also set *num_buffers to be inst->fbc_buf_count for V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, like this: } else if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { if (*num_buffers < inst->fbc_buf_count) *num_buffers = inst->fbc_buf_count; switch (*num_planes) { case 1: ... case 2: ... case 3: ... } } The reason for that is if fbc_buf_count is greater than initial num_buffers, wave5_vpu_dec_job_ready() wouldn't allow to invoke wave5_vpu_dec_device_run() Here is a part of the log of described situation: vdec 20410000.wave515: Switch state from NONE to OPEN. [...] vdec 20410000.wave515: wave5_vpu_dec_init_seq: init seq sent (queue 1 : 1) vdec 20410000.wave515: wave5_vpu_dec_get_seq_info: init seq complete (queue 0 : 0) [...] vdec 20410000.wave515: handle_dynamic_resolution_change: width: 4112 height: 3008 profile: 1 | minbuffer: 6 ^^^^^^^^ note that minbuffer is 6 vdec 20410000.wave515: Switch state from OPEN to INIT_SEQ. [...] vdec 20410000.wave515: decoder command: 1 [...] vdec 20410000.wave515: wave5_vpu_dec_queue_setup: num_buffers: 4 | num_planes: 0 | type: 9 ^^^^^^^^ note that num_buffers is 4 vdec 20410000.wave515: wave5_vpu_dec_queue_setup: size[0]: 18625536 vdec 20410000.wave515: CAPTURE queue must be streaming to queue jobs! vdec 20410000.wave515: CAPTURE queue must be streaming to queue jobs! vdec 20410000.wave515: CAPTURE queue must be streaming to queue jobs! vdec 20410000.wave515: CAPTURE queue must be streaming to queue jobs! vdec 20410000.wave515: wave5_vpu_dec_buf_queue: type: 9 index: 0 size: ([0]=18625536, [1]= 0, [2]= 0) vdec 20410000.wave515: wave5_vpu_dec_buf_queue: type: 9 index: 1 size: ([0]=18625536, [1]= 0, [2]= 0) vdec 20410000.wave515: wave5_vpu_dec_buf_queue: type: 9 index: 2 size: ([0]=18625536, [1]= 0, [2]= 0) vdec 20410000.wave515: wave5_vpu_dec_buf_queue: type: 9 index: 3 size: ([0]=18625536, [1]= 0, [2]= 0) vdec 20410000.wave515: wave5_vpu_dec_start_streaming: type: 9 vdec 20410000.wave515: No capture buffer ready to decode! ^^^^^^^^ here v4l2_m2m_num_dst_bufs_ready(m2m_ctx) < (inst->fbc_buf_count - 1), namely 4 < 6 vdec 20410000.wave515: wave5_vpu_dec_stop_streaming: type: 9 vdec 20410000.wave515: streamoff_capture: Setting display flag of buf index: 0, fail: -22 vdec 20410000.wave515: streamoff_capture: Setting display flag of buf index: 1, fail: -22 vdec 20410000.wave515: streamoff_capture: Setting display flag of buf index: 2, fail: -22 vdec 20410000.wave515: streamoff_capture: Setting display flag of buf index: 3, fail: -22 [...] vdec 20410000.wave515: wave5_vpu_dec_close: dec_finish_seq complete Altering num_buffers solves the issue for me. > + if (inst->output_format == FORMAT_422) > + sizes[0] = inst_format.width * inst_format.height * 2; > + else > + sizes[0] = inst_format.width * inst_format.height * 3 / 2; > + dev_dbg(inst->dev->dev, "%s: size[0]: %u\n", __func__, sizes[0]); > + } else if (*num_planes == 2) { > + sizes[0] = inst_format.width * inst_format.height; > + if (inst->output_format == FORMAT_422) > + sizes[1] = inst_format.width * inst_format.height; > + else > + sizes[1] = inst_format.width * inst_format.height / 2; > + dev_dbg(inst->dev->dev, "%s: size[0]: %u | size[1]: %u\n", > + __func__, sizes[0], sizes[1]); > + } else if (*num_planes == 3) { > + sizes[0] = inst_format.width * inst_format.height; > + if (inst->output_format == FORMAT_422) { > + sizes[1] = inst_format.width * inst_format.height / 2; > + sizes[2] = inst_format.width * inst_format.height / 2; > + } else { > + sizes[1] = inst_format.width * inst_format.height / 4; > + sizes[2] = inst_format.width * inst_format.height / 4; > + } > + dev_dbg(inst->dev->dev, "%s: size[0]: %u | size[1]: %u | size[2]: %u\n", > + __func__, sizes[0], sizes[1], sizes[2]); > + } > + } > + > + return 0; > +} BTW I'm currently tinkering with your patchset on another C&M IP and would be gratefull if you Cc me in the future versions of the patchset, if any. Thanks. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel