From patchwork Wed Nov 8 19:29:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Fricke X-Patchwork-Id: 13450495 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 B9D44C4167B for ; Wed, 8 Nov 2023 19:30:03 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+rJ6kDUFQn7vOyQRlfDWHqmeZrVHtKsqdQIm7oMqDac=; b=hnA2Ru3t8/3Klg CtAHmjaeALbXoa4KYmvRI6ydWwdz+PY2VisvRMnvqdR1Xut/NoqeU5TZoT44qRTcWQinbQtUHuMMD nHQAO1wh1D1eNlqGTQ/dWo6M6RvTcacIqNASIn4+xCaF2UKjlE0HZ1mNgSMkiuAonZ6BlC57I7usJ bIp3p+9N5jgMuTcTQvbG3X7/OXeFoI12o8rgk9EXxxkxq5sLhMkADrv1refvqfnXoDRqIUXPESD7a 0Hqofw0/tyE6tu0J16xCw8M6Mu7XwOYCVsu1mm6gPb4czsDj2TSYhX91X0EXLiEDZ5xkKeIzbW3qt 0qBTXoo4pHX91RN+H8/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0oF3-004cAT-0V; Wed, 08 Nov 2023 19:29:33 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0oF0-004c9c-14 for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2023 19:29:31 +0000 Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sebastianfricke) by madras.collabora.co.uk (Postfix) with ESMTPSA id 0395766076A1; Wed, 8 Nov 2023 19:29:29 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699471769; bh=cGOweYfxq9nnkhXXEN78c1BIl1bT21hvfnRwjm5+EWU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DkWc+2wOl7TZr2lgzNV6wvD1baeXaP+7a2MQtnyY7RkAjS66BmF0RGet8nD95mY7k CMvvshro9kPfebcqEQF6PRQG6Mv14soIbTckCkY7ToR8nVsIwn+KtIh1L48ck6pptV tMyI2Qin62vf2UBq9g7+O/JBx0/nvhG8QxAhzgc+L3TzTMpibZMV3BjdNsJchPo4qJ o5q5L5+x2qCNPYNlAQtQy31yoJHBHwEds/xV6CT3BJ1b+weBiF1FL3G/2cX5L5SCKE 3bmL++iwFunrL3jJx+oszoBN7w93sUBWOnezhZeXajwYZrDqtQFQ62nDOzAkdVcA8O CI9wGMnE8mdIQ== From: Sebastian Fricke Date: Wed, 08 Nov 2023 20:29:20 +0100 Subject: [PATCH v14 1/8] media: v4l2: Add ignore_streaming flag MIME-Version: 1.0 Message-Id: <20231108-wave5-v14-rebased-v14-1-0b4af1258656@collabora.com> References: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> In-Reply-To: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> To: Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Conor Dooley , Nas Chung , Fabio Estevam , Krzysztof Kozlowski , Jackson Lee , Shawn Guo , Sascha Hauer , Hans Verkuil , Philipp Zabel , Rob Herring Cc: Ivan Bornyakov , Deborah Brouwer , Nicolas Dufresne , devicetree@vger.kernel.org, Robert Beckett , Sebastian Fricke , linux-arm-kernel@lists.infradead.org, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org X-Mailer: b4 0.11.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699471762; l=1867; i=sebastian.fricke@collabora.com; s=linux-media; h=from:subject:message-id; bh=cGOweYfxq9nnkhXXEN78c1BIl1bT21hvfnRwjm5+EWU=; b=qgoFR5YHyrLgwpt94fHa9DUFnBayF/kmFDx+LRoPS5xqxCdaFN6NO1gti2cm/txGrv3xgLoczPYB LllqukNzBCqB96usyV4kBDMfCLGsu27V0cezxEpX4ETRSeA5xuFB X-Developer-Key: i=sebastian.fricke@collabora.com; a=ed25519; pk=pYXedPwrTtErcj7ERYeo/IpTrpe4QbJuEzSB52fslBg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231108_112930_493334_CC787CEA X-CRM114-Status: GOOD ( 12.81 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a new flag to the `struct v4l2_m2m_dev` to toggle whether a queue must be streaming in order to allow queuing jobs to the ready queue. Currently, both queues (CAPTURE & OUTPUT) must be streaming in order to allow adding new jobs. This behavior limits the usability of M2M for some drivers, as these have to be able, to perform analysis of the sequence to ensure, that userspace prepares the CAPTURE queue correctly. Signed-off-by: Sebastian Fricke Signed-off-by: Nicolas Dufresne --- include/media/v4l2-mem2mem.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index d6c8eb2b5201..1288fe364fab 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -84,6 +84,12 @@ struct v4l2_m2m_queue_ctx { * @last_src_buf: indicate the last source buffer for draining * @next_buf_last: next capture queud buffer will be tagged as last * @has_stopped: indicate the device has been stopped + * @ignore_cap_streaming: If true, job_ready can be called even if the CAPTURE + * queue is not streaming. This allows firmware to + * analyze the bitstream header which arrives on the + * OUTPUT queue. The driver must implement the job_ready + * callback correctly to make sure that the requirements + * for actual decoding are met. * @m2m_dev: opaque pointer to the internal data to handle M2M context * @cap_q_ctx: Capture (output to memory) queue context * @out_q_ctx: Output (input from memory) queue context @@ -106,6 +112,7 @@ struct v4l2_m2m_ctx { struct vb2_v4l2_buffer *last_src_buf; bool next_buf_last; bool has_stopped; + bool ignore_cap_streaming; /* internal use only */ struct v4l2_m2m_dev *m2m_dev; From patchwork Wed Nov 8 19:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Fricke X-Patchwork-Id: 13450496 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 4034FC04FDE for ; Wed, 8 Nov 2023 19:30:12 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ai09cIcMBcDYU5JmCtbV9FTt0Tg2eZdAfNlO3zCZ9+8=; b=MF4jR/08D9Wv5t J+FBHhCfABOuXsCL5OIWP7goBdnvir2eoWK8jnLH86cI3Lmf9vXrs0lITLJuRBUHT82JqqRP1lUof EhdkgfvdNrdHVxjmLPGzOpHFboOEp4mpHhnosYrBZ7IznmEDW7IKCPt1ZBvDY/LbKgLC7pOtgYSVt WO659hYFI1JOMzqi9JNZNC6D8lyb6FIae8x9CKDYTjgmp2kRD/Kjn+fbND03EZNljc9Z9XYHom8/1 XJWwwS49xyT+izB81uHzfT0/x9FVkHcZ3eYgouBnCkWEkue320XML4CtTDRX7SYZuvXChlsN2mbSg gnWuIEjepkYcbGAtHhpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0oF8-004cD1-1O; Wed, 08 Nov 2023 19:29:38 +0000 Received: from madras.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e5ab]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0oF5-004cAS-35 for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2023 19:29:37 +0000 Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sebastianfricke) by madras.collabora.co.uk (Postfix) with ESMTPSA id 08B0366076A4; Wed, 8 Nov 2023 19:29:32 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699471772; bh=skHV6yLqygB24iyWjVzqydymdJD3VIyGNE+PRIszSIU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=InfcwSPse6KMWPwbGex6YxPiuiQFodBVoaU4RS0feLn0o36mDImTOMK3ts76vy5lL Uh3/duaOi+/ftk60TBom6Nc6D8aoVCXwyOJo2Yr6hQprQpwixHmE78sDaS/HATnFs/ erGQlP75/ZmeUlWssWUNFdfTtCuEZP+hjMiTzEDsb5Epn84ZM8m/cvcMwRbSshBGQv 3Y7uwlu1AIkSiRSD+73MjA0ey+OPbRsXktif50LAOCGCnMDUatQCLgEOBUxJ0gctXz XSBRRSUJCq8EPgNGPOHw13MQCtsHwNqdrxNNkXbbAfbz1FjLc177BNGKclFaAVi5Pv 3OxD8U6AB/fAA== From: Sebastian Fricke Date: Wed, 08 Nov 2023 20:29:21 +0100 Subject: [PATCH v14 2/8] media: v4l2: Allow M2M job queuing w/o streaming CAP queue MIME-Version: 1.0 Message-Id: <20231108-wave5-v14-rebased-v14-2-0b4af1258656@collabora.com> References: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> In-Reply-To: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> To: Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Conor Dooley , Nas Chung , Fabio Estevam , Krzysztof Kozlowski , Jackson Lee , Shawn Guo , Sascha Hauer , Hans Verkuil , Philipp Zabel , Rob Herring Cc: Ivan Bornyakov , Deborah Brouwer , Nicolas Dufresne , devicetree@vger.kernel.org, Robert Beckett , Sebastian Fricke , linux-arm-kernel@lists.infradead.org, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org X-Mailer: b4 0.11.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699471762; l=1342; i=sebastian.fricke@collabora.com; s=linux-media; h=from:subject:message-id; bh=skHV6yLqygB24iyWjVzqydymdJD3VIyGNE+PRIszSIU=; b=EpTI7SOT/Y+eiNPBtdvlzROETGWIdBOeroCE4E135OSd2AlHobddLnp6hRzQMJfiiW1oeOdctxsS fB3vlBteCZvJLcKcNNdFIRsyhCibpJoZ5rykalbMGJ+sukCIgawe X-Developer-Key: i=sebastian.fricke@collabora.com; a=ed25519; pk=pYXedPwrTtErcj7ERYeo/IpTrpe4QbJuEzSB52fslBg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231108_112936_121716_4F9BBA6C X-CRM114-Status: GOOD ( 11.38 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Allow decoder drivers to enable set the ignore_streaming flag on their CAPTURE queue, to allow queuing jobs to the M2M ready queue and perform firmware sequence analysis with just a streaming OUTPUT queue and available bitstream data. Signed-off-by: Sebastian Fricke Signed-off-by: Nicolas Dufresne --- drivers/media/v4l2-core/v4l2-mem2mem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c index 0cc30397fbad..9e983176542b 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -301,9 +301,12 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev, dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx); - if (!m2m_ctx->out_q_ctx.q.streaming - || !m2m_ctx->cap_q_ctx.q.streaming) { - dprintk("Streaming needs to be on for both queues\n"); + if (!m2m_ctx->out_q_ctx.q.streaming || + (!m2m_ctx->cap_q_ctx.q.streaming && !m2m_ctx->ignore_cap_streaming)) { + if (!m2m_ctx->ignore_cap_streaming) + dprintk("Streaming needs to be on for both queues\n"); + else + dprintk("Streaming needs to be on for the OUTPUT queue\n"); return; } From patchwork Wed Nov 8 19:29:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Fricke X-Patchwork-Id: 13450498 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 746FDC04E88 for ; Wed, 8 Nov 2023 19:30:10 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lzQC7ox16YEAdAu6SHoPW3f/IRkoI23AwAx6TyyiQjM=; b=tlg4tagfgNl92I avQ0k+Yz/km4wkNrMQnhUr0bpHyXCsE42TYQchrZCr2iRaJNPZvwIltGQtk3tm2Cz0nQ1hIBP9sRO /XHeny1yElyyzEdYvL3DiffLWTSaGbfc+N3jv7TpzrrXGtvg42gZgazClWOQjz4sUALAmTuaaUEfu SfcX0ZRJeBRtRM0A39ge3OiJDoDFYQh5t5VjjckY8GqlIPRKt5VgBTGbYTyfqsamooKX+uny21AhI areY/xIJ7/uPYWgKbmw/4Qo1gyKKPh/j538769YfhSDQJNCnT5w3rWopS0lUh8dkS44UQbUiQm+86 6PwyRwpo0pthW4iuAe+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0oFB-004cFT-2d; Wed, 08 Nov 2023 19:29:41 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0oF6-004cBV-0W for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2023 19:29:38 +0000 Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sebastianfricke) by madras.collabora.co.uk (Postfix) with ESMTPSA id C6D5266076A0; Wed, 8 Nov 2023 19:29:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699471775; bh=aK1k6ZUDMEWvRW1SIf0yxY7W/lghFpQ18qUgnJU7TEM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=J9WMV6vefSuQcuNSS2Cvc3wKol98CwSYzSRUlnngRTg8BEaWRalJi/kdrFr0HoP2O Yg3nmTIxJMNYAsfNFUQkXCeD1tE0VoZdGhy5kAroJRTb5pqtmuwTA1t72juxui5aTq IfNcKyraupBs67ChZUv1SwVCtjbXlPVfvYROQvITBc4Y6xRo3SrrvuuKcIrT5A0gpI yyYIHhJ+u2pe1FpYtG2CM1unALD8WdDjzPzVBeJAXQ72qGsQ4NQdSLyrhDZpg3evcz AZgH5IButOBLC2TmZxF+icr1twKdLmj4yHv0geCYQdVCKi5wVIC0mAXkkwUPZ72Hlb Dh92Sk+yg15ow== From: Sebastian Fricke Date: Wed, 08 Nov 2023 20:29:22 +0100 Subject: [PATCH v14 3/8] media: platform: chips-media: Move Coda to separate folder MIME-Version: 1.0 Message-Id: <20231108-wave5-v14-rebased-v14-3-0b4af1258656@collabora.com> References: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> In-Reply-To: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> To: Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Conor Dooley , Nas Chung , Fabio Estevam , Krzysztof Kozlowski , Jackson Lee , Shawn Guo , Sascha Hauer , Hans Verkuil , Philipp Zabel , Rob Herring Cc: Ivan Bornyakov , Deborah Brouwer , Nicolas Dufresne , devicetree@vger.kernel.org, Robert Beckett , Sebastian Fricke , linux-arm-kernel@lists.infradead.org, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org X-Mailer: b4 0.11.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699471762; l=8113; i=sebastian.fricke@collabora.com; s=linux-media; h=from:subject:message-id; bh=aK1k6ZUDMEWvRW1SIf0yxY7W/lghFpQ18qUgnJU7TEM=; b=sfLjZVL/+3KBh4+98yl0vHadJKbjsniLt3KPsKD6kbRMxbuENaXReRMMaqxCZaj9i1GAkIeeslyB 0JesLUlXCMkrkfLWGUsXaX24cKIzbVZTOAwpL3PIVw+N4LApBK3L X-Developer-Key: i=sebastian.fricke@collabora.com; a=ed25519; pk=pYXedPwrTtErcj7ERYeo/IpTrpe4QbJuEzSB52fslBg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231108_112936_467322_477936A0 X-CRM114-Status: GOOD ( 16.30 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Prepare the folder structure for a second Chips&Media driver. Move the Coda driver to a sub-directory. Signed-off-by: Sebastian Fricke --- MAINTAINERS | 2 +- drivers/media/platform/chips-media/Kconfig | 17 +---------------- drivers/media/platform/chips-media/Makefile | 5 +---- drivers/media/platform/chips-media/coda/Kconfig | 18 ++++++++++++++++++ drivers/media/platform/chips-media/coda/Makefile | 6 ++++++ .../media/platform/chips-media/{ => coda}/coda-bit.c | 0 .../platform/chips-media/{ => coda}/coda-common.c | 0 .../media/platform/chips-media/{ => coda}/coda-gdi.c | 0 .../media/platform/chips-media/{ => coda}/coda-h264.c | 0 .../media/platform/chips-media/{ => coda}/coda-jpeg.c | 0 .../media/platform/chips-media/{ => coda}/coda-mpeg2.c | 0 .../media/platform/chips-media/{ => coda}/coda-mpeg4.c | 0 drivers/media/platform/chips-media/{ => coda}/coda.h | 0 .../media/platform/chips-media/{ => coda}/coda_regs.h | 0 .../media/platform/chips-media/{ => coda}/imx-vdoa.c | 0 .../media/platform/chips-media/{ => coda}/imx-vdoa.h | 0 drivers/media/platform/chips-media/{ => coda}/trace.h | 2 +- 17 files changed, 28 insertions(+), 22 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index f3e6dbbbbccb..93225b546030 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5104,7 +5104,7 @@ M: Philipp Zabel L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/coda.yaml -F: drivers/media/platform/chips-media/ +F: drivers/media/platform/chips-media/coda CODE OF CONDUCT M: Greg Kroah-Hartman diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig index 57f8f8a22df8..f87a0d693df7 100644 --- a/drivers/media/platform/chips-media/Kconfig +++ b/drivers/media/platform/chips-media/Kconfig @@ -2,19 +2,4 @@ comment "Chips&Media media platform drivers" -config VIDEO_CODA - tristate "Chips&Media Coda multi-standard codec IP" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && OF && (ARCH_MXC || COMPILE_TEST) - select SRAM - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_VMALLOC - select V4L2_JPEG_HELPER - select V4L2_MEM2MEM_DEV - select GENERIC_ALLOCATOR - help - Coda is a range of video codec IPs that supports - H.264, MPEG-4, and other video formats. - -config VIDEO_IMX_VDOA - def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST +source "drivers/media/platform/chips-media/coda/Kconfig" diff --git a/drivers/media/platform/chips-media/Makefile b/drivers/media/platform/chips-media/Makefile index bbb16425a875..5ee693f651c1 100644 --- a/drivers/media/platform/chips-media/Makefile +++ b/drivers/media/platform/chips-media/Makefile @@ -1,6 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -coda-vpu-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o - -obj-$(CONFIG_VIDEO_CODA) += coda-vpu.o -obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o +obj-y += coda/ diff --git a/drivers/media/platform/chips-media/coda/Kconfig b/drivers/media/platform/chips-media/coda/Kconfig new file mode 100644 index 000000000000..cb7b66c71380 --- /dev/null +++ b/drivers/media/platform/chips-media/coda/Kconfig @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config VIDEO_CODA + tristate "Chips&Media Coda multi-standard codec IP" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && OF && (ARCH_MXC || COMPILE_TEST) + select SRAM + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_VMALLOC + select V4L2_JPEG_HELPER + select V4L2_MEM2MEM_DEV + select GENERIC_ALLOCATOR + help + Coda is a range of video codec IPs that supports + H.264, MPEG-4, and other video formats. + +config VIDEO_IMX_VDOA + def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST diff --git a/drivers/media/platform/chips-media/coda/Makefile b/drivers/media/platform/chips-media/coda/Makefile new file mode 100644 index 000000000000..bbb16425a875 --- /dev/null +++ b/drivers/media/platform/chips-media/coda/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only + +coda-vpu-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-mpeg2.o coda-mpeg4.o coda-jpeg.o + +obj-$(CONFIG_VIDEO_CODA) += coda-vpu.o +obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o diff --git a/drivers/media/platform/chips-media/coda-bit.c b/drivers/media/platform/chips-media/coda/coda-bit.c similarity index 100% rename from drivers/media/platform/chips-media/coda-bit.c rename to drivers/media/platform/chips-media/coda/coda-bit.c diff --git a/drivers/media/platform/chips-media/coda-common.c b/drivers/media/platform/chips-media/coda/coda-common.c similarity index 100% rename from drivers/media/platform/chips-media/coda-common.c rename to drivers/media/platform/chips-media/coda/coda-common.c diff --git a/drivers/media/platform/chips-media/coda-gdi.c b/drivers/media/platform/chips-media/coda/coda-gdi.c similarity index 100% rename from drivers/media/platform/chips-media/coda-gdi.c rename to drivers/media/platform/chips-media/coda/coda-gdi.c diff --git a/drivers/media/platform/chips-media/coda-h264.c b/drivers/media/platform/chips-media/coda/coda-h264.c similarity index 100% rename from drivers/media/platform/chips-media/coda-h264.c rename to drivers/media/platform/chips-media/coda/coda-h264.c diff --git a/drivers/media/platform/chips-media/coda-jpeg.c b/drivers/media/platform/chips-media/coda/coda-jpeg.c similarity index 100% rename from drivers/media/platform/chips-media/coda-jpeg.c rename to drivers/media/platform/chips-media/coda/coda-jpeg.c diff --git a/drivers/media/platform/chips-media/coda-mpeg2.c b/drivers/media/platform/chips-media/coda/coda-mpeg2.c similarity index 100% rename from drivers/media/platform/chips-media/coda-mpeg2.c rename to drivers/media/platform/chips-media/coda/coda-mpeg2.c diff --git a/drivers/media/platform/chips-media/coda-mpeg4.c b/drivers/media/platform/chips-media/coda/coda-mpeg4.c similarity index 100% rename from drivers/media/platform/chips-media/coda-mpeg4.c rename to drivers/media/platform/chips-media/coda/coda-mpeg4.c diff --git a/drivers/media/platform/chips-media/coda.h b/drivers/media/platform/chips-media/coda/coda.h similarity index 100% rename from drivers/media/platform/chips-media/coda.h rename to drivers/media/platform/chips-media/coda/coda.h diff --git a/drivers/media/platform/chips-media/coda_regs.h b/drivers/media/platform/chips-media/coda/coda_regs.h similarity index 100% rename from drivers/media/platform/chips-media/coda_regs.h rename to drivers/media/platform/chips-media/coda/coda_regs.h diff --git a/drivers/media/platform/chips-media/imx-vdoa.c b/drivers/media/platform/chips-media/coda/imx-vdoa.c similarity index 100% rename from drivers/media/platform/chips-media/imx-vdoa.c rename to drivers/media/platform/chips-media/coda/imx-vdoa.c diff --git a/drivers/media/platform/chips-media/imx-vdoa.h b/drivers/media/platform/chips-media/coda/imx-vdoa.h similarity index 100% rename from drivers/media/platform/chips-media/imx-vdoa.h rename to drivers/media/platform/chips-media/coda/imx-vdoa.h diff --git a/drivers/media/platform/chips-media/trace.h b/drivers/media/platform/chips-media/coda/trace.h similarity index 99% rename from drivers/media/platform/chips-media/trace.h rename to drivers/media/platform/chips-media/coda/trace.h index 19f98e6dafb9..abc6a01a74e9 100644 --- a/drivers/media/platform/chips-media/trace.h +++ b/drivers/media/platform/chips-media/coda/trace.h @@ -167,7 +167,7 @@ DEFINE_EVENT(coda_buf_class, coda_jpeg_done, #endif /* __CODA_TRACE_H__ */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/media/platform/chips-media +#define TRACE_INCLUDE_PATH ../../drivers/media/platform/chips-media/coda #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace From patchwork Wed Nov 8 19:29:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Fricke X-Patchwork-Id: 13450497 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 36026C4332F for ; Wed, 8 Nov 2023 19:30:14 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0m4E3LYmAwCudUnNF3T9nhCu0uoFlYuJx7cWBeKzHxU=; b=ADxNWD+oYaVj8X nxKziFx/wNzGZjamf3jl/sTZnjZ4nYObZdUY8kwO9fhgN5QGITedxU3X9iHl5DfNLN90H8MfTMqGa EMjpZ/j1g1UMGm+zEXUhkvWGX5soaiDHJMFiPq3RMN1M+jAe02qFKjHwYOFywGfhityG+8wjC2Oye OBhR6jf2/jkS7/Xc95U2B556dnJsKGQ1bJ/Yr7SUUVo9efdDkKNr4Yg2Gms8hrs+tLwaUE+4WF+Li b9qwWhDagQvv9/u1INOrlmGcj36ULBgSoJxCB8wTd0ZKdF7TzNTgN4rHNRabUAgbw+p6+R+K/O4dj uU8Q7Eliywvaj87Gt6zw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0oFJ-004cJT-0h; Wed, 08 Nov 2023 19:29:49 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0oFG-004cHN-0X for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2023 19:29:47 +0000 Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sebastianfricke) by madras.collabora.co.uk (Postfix) with ESMTPSA id C455566076A1; Wed, 8 Nov 2023 19:29:44 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699471785; bh=+M/XFwuoS8Bp+9J2sOkehobAagQvw9CTARjex8BHNCs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=n1BWT2jbUaPAY0BP3M0AZ0hAPX5a+/+o0zRirCzFHoDI41TL9HwTcTJnsl2jHTK37 fmeVD0KHpxXQVrQ8TA5MDubFZbr0Gq9CCO7EupXzfIvkDzR+9+6D/Vc9A+LoMWL89k 3zCnr3YHLQDyI/g7f8LSlSppqxzgTDBBvgvfHbeqPnKAVGj6FJ9W+KFxGvPyCv7k7c rc7aN2JjKZbmgYxSggCGzLBiqLxpLqt0ppAxjQ0JtKKcLfQd8wIGCV6+v9K+Et4eQH Up2BxG2vGMqEwBOAP+uy1QUUcRVJYXuWJJc4KRHi5fxAwutm3s8SgsnYhNGYKY58lY 6e2rxO2C/0cKA== From: Sebastian Fricke Date: Wed, 08 Nov 2023 20:29:25 +0100 Subject: [PATCH v14 6/8] dt-bindings: media: wave5: add yaml devicetree bindings MIME-Version: 1.0 Message-Id: <20231108-wave5-v14-rebased-v14-6-0b4af1258656@collabora.com> References: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> In-Reply-To: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> To: Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Conor Dooley , Nas Chung , Fabio Estevam , Krzysztof Kozlowski , Jackson Lee , Shawn Guo , Sascha Hauer , Hans Verkuil , Philipp Zabel , Rob Herring Cc: Ivan Bornyakov , Deborah Brouwer , Nicolas Dufresne , devicetree@vger.kernel.org, Robert Beckett , Sebastian Fricke , linux-arm-kernel@lists.infradead.org, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org X-Mailer: b4 0.11.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699471762; l=2060; i=sebastian.fricke@collabora.com; s=linux-media; h=from:subject:message-id; bh=MTAjIh3c6yvf57nqbdf6r3Khe9NwAJmaJM3Z3pg51fU=; b=NYPN04rZKIGlDUZJTXnVo7K81Xx8x0TtifT41qQCuyHNPCTqhQnrQfmNc4XgcApvNqVdkdUWzfoB KTCZhXnRDlRHgxD2x4TH8gjSiZBPMecp7AX0zC4f/XzJfU9zgszf X-Developer-Key: i=sebastian.fricke@collabora.com; a=ed25519; pk=pYXedPwrTtErcj7ERYeo/IpTrpe4QbJuEzSB52fslBg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231108_112946_363801_335FA915 X-CRM114-Status: GOOD ( 12.53 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Robert Beckett Add bindings for the wave5 chips&media codec driver Signed-off-by: Robert Beckett Signed-off-by: Dafna Hirschfeld Signed-off-by: Sebastian Fricke Reviewed-by: Rob Herring --- .../devicetree/bindings/media/cnm,wave521c.yaml | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/Documentation/devicetree/bindings/media/cnm,wave521c.yaml b/Documentation/devicetree/bindings/media/cnm,wave521c.yaml new file mode 100644 index 000000000000..6d5569e77b7a --- /dev/null +++ b/Documentation/devicetree/bindings/media/cnm,wave521c.yaml @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/cnm,wave521c.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Chips&Media Wave 5 Series multi-standard codec IP + +maintainers: + - Nas Chung + - Jackson Lee + +description: + The Chips&Media WAVE codec IP is a multi format video encoder/decoder + +properties: + compatible: + items: + - enum: + - ti,k3-j721s2-wave521c + - const: cnm,wave521c + + reg: + maxItems: 1 + + clocks: + items: + - description: VCODEC clock + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + resets: + maxItems: 1 + + sram: + $ref: /schemas/types.yaml#/definitions/phandle + description: + The VPU uses the SRAM to store some of the reference data instead of + storing it on DMA memory. It is mainly used for the purpose of reducing + bandwidth. + +required: + - compatible + - reg + - clocks + +additionalProperties: false + +examples: + - | + vpu: video-codec@12345678 { + compatible = "ti,k3-j721s2-wave521c", "cnm,wave521c"; + reg = <0x12345678 0x1000>; + clocks = <&clks 42>; + interrupts = <42>; + sram = <&sram>; + }; From patchwork Wed Nov 8 19:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Fricke X-Patchwork-Id: 13450500 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 2F8CAC4167B for ; Wed, 8 Nov 2023 19:30:17 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=a412KKlGRR8+9Sfnp5ZkEzqlYm58N2JKqlYaBxoneLM=; b=BpnrqJ+GOlYHUe XkhkgPhFvoY05XH1QzAUBGAn+qsQ60Ix2bw6ETsD0+TXxwcrXjA6Qlnjg8+pjrj45zafemvAJxt4U MEtbANyhx8YE52q4Nc+8/Rj4oqv0iHFcxOWrEll8Fn/erA5PRhwT+Lu5Ueufhvo2m29kwJ7jP3DRc 4SkgDdTQKyhgYkJN9FIM4n5LeKDw8JL5TxbrY8on2syU4hY9FSorq0YKw8x1VfEo+g4/sKXl8XaxS 6/wriOlRT+Kg7bST5FAQj/SdODeaR1Ov+ngh7jGuZ36QYMFDud5E1FRkr5Wm4JjQQlg6qvMZO6OKl 1HBIzfB9ForepKlZBhgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0oFN-004cLR-1b; Wed, 08 Nov 2023 19:29:53 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0oFI-004cIm-2r for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2023 19:29:50 +0000 Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sebastianfricke) by madras.collabora.co.uk (Postfix) with ESMTPSA id 8A34C66076A3; Wed, 8 Nov 2023 19:29:47 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699471787; bh=6zVh5ZRGB94zYWwPnfDMw9/tOA79poxhEzq+D9eHqX4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WxlDFGAjdFh2/XiyUkmQnDUINnmBROZN+rX0rAX4BCEXsY9Fp5UM2wFbiHfyL5qAI vka9cI8LEjl3JbkL5x8onoajzhgNLOJUyujPH1eaxHr4ZiRFdU6w8TqVhYKZ3r7Hn2 8k/Pm2PGMtPenrv9qLcWF63/ttNIu2xL77OBtoRB9lkf7vVhEUEi12y9a6grIuT/Pf XK7wIPeK9gY58lTEjOfvbGS+e+NjD5T4cZiYsYUcKFyEGoTFcYR5INLuvegFdX5BGZ ULvnopIIAPLBczKOidDKLGWoLUz1taHbZSlOsgU65md0RAOXk9zY0yZmYSer51xz8J UUkqcd46YyW8w== From: Sebastian Fricke Date: Wed, 08 Nov 2023 20:29:26 +0100 Subject: [PATCH v14 7/8] media: chips-media: wave5: Add wave5 driver to maintainers file MIME-Version: 1.0 Message-Id: <20231108-wave5-v14-rebased-v14-7-0b4af1258656@collabora.com> References: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> In-Reply-To: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> To: Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Conor Dooley , Nas Chung , Fabio Estevam , Krzysztof Kozlowski , Jackson Lee , Shawn Guo , Sascha Hauer , Hans Verkuil , Philipp Zabel , Rob Herring Cc: Ivan Bornyakov , Deborah Brouwer , Nicolas Dufresne , devicetree@vger.kernel.org, Robert Beckett , Sebastian Fricke , linux-arm-kernel@lists.infradead.org, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org X-Mailer: b4 0.11.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699471762; l=1012; i=sebastian.fricke@collabora.com; s=linux-media; h=from:subject:message-id; bh=pkGDwg92UIV8PdVq9WgZQLHgj/O020tNNUqapWxKG5E=; b=OnDCp0TdFPZHfi6uDiYcc+/ABb5je8EDo1XosiScLjsBGd0EWAuL0ehcUhSxw4lCpmgl2syIRMLc f1+Oa9iwAC51iQHLFrQCnXwn64vsx8BNVycG3xsOx4sIE5i/RKiY X-Developer-Key: i=sebastian.fricke@collabora.com; a=ed25519; pk=pYXedPwrTtErcj7ERYeo/IpTrpe4QbJuEzSB52fslBg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231108_112949_057619_A266172B X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Robert Beckett Add the Chips&Media wave5 encoder/decoder driver to the maintainers file Signed-off-by: Robert Beckett Signed-off-by: Dafna Hirschfeld Signed-off-by: Sebastian Fricke --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 93225b546030..50758d1fcbf2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23234,6 +23234,14 @@ F: include/linux/watchdog.h F: include/trace/events/watchdog.h F: include/uapi/linux/watchdog.h +WAVE5 VPU CODEC DRIVER +M: Nas Chung +M: Jackson Lee +L: linux-media@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/media/cnm,wave5.yaml +F: drivers/media/platform/chips-media/wave5/ + WHISKEYCOVE PMIC GPIO DRIVER M: Kuppuswamy Sathyanarayanan L: linux-gpio@vger.kernel.org From patchwork Wed Nov 8 19:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Fricke X-Patchwork-Id: 13450501 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 AA67AC4167D for ; Wed, 8 Nov 2023 19:30:25 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cT4XMGp3DsOKXRDX0ZaClBEvk0Jeu7YQLS14Imv2j6Y=; b=BmNmpMWM628JYj KUgkasO6npsRsxyDskQY6KN0ODqVLyNNtiBaZneH2IVyXwiT2CxxFImo4Y/U1BT6R2Zoysw6hz0Mp EC7ICkrgHlDLS669zq9ZuStrik7Wv9e98nDBKeMqyLlK042Ph7E5QBEvbPAl70fWlyZR/mGKgKq71 5SQGyrkdjbiT4dJNkM26JYnsgLtkktvlMaPWNRwKo59jnM/lU6Nr+pjwcQGOViclfnowycZDAm8eR /T/5kRpg+GTLxiq84m5w0R98vjdPLAQr2wCnsEm1Tbxp+E1JKG+o7fy5Kl49cy4ZElSNrxaOU9roj xVAzXBQnZUQivvHyLKzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0oFQ-004cNF-0y; Wed, 08 Nov 2023 19:29:56 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0oFL-004cKG-2U for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2023 19:29:53 +0000 Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sebastianfricke) by madras.collabora.co.uk (Postfix) with ESMTPSA id 6FF6066076A4; Wed, 8 Nov 2023 19:29:50 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699471790; bh=5EEmjqlfCXr8f+nuvWUkqpYUqLb0BgV0iKNe92KcenM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gCZrvwAHe2TWO1Wo0jrUc/A2yRzfk3/yQekgz37lh4W33cS+Z8pyvKZE+I0DgW+qw SPSRKV12dyF8KpweC/+/Z1NMlc4sizlTBsDp5LNlhdzzkGGUsKinbZjP0OBanO4cSi UWUp00EdVpvfuVRnETm5bP9i+ZVX1HyY7oi6TWdytPzedss0vxYrkhJTFNZcDrIrWM bEh20O2cNrWjY7u2IOmHAtjAmS6+YCwj8TgK9igVNoPyeJfNeuzUOuY7Y7FRmZx/iZ L1ylJBm1QB0GyZLZPf4Xfabboyo3oE9wf2GI2bUl/ykicufXncFeckeFp0VuuZ/ER1 ybWRNxRgYEDYg== From: Sebastian Fricke Date: Wed, 08 Nov 2023 20:29:27 +0100 Subject: [PATCH v14 8/8] arm64: dts: ti: k3-j721s2-main: add wave5 video encoder/decoder node MIME-Version: 1.0 Message-Id: <20231108-wave5-v14-rebased-v14-8-0b4af1258656@collabora.com> References: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> In-Reply-To: <20231108-wave5-v14-rebased-v14-0-0b4af1258656@collabora.com> To: Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Conor Dooley , Nas Chung , Fabio Estevam , Krzysztof Kozlowski , Jackson Lee , Shawn Guo , Sascha Hauer , Hans Verkuil , Philipp Zabel , Rob Herring Cc: Ivan Bornyakov , Deborah Brouwer , Nicolas Dufresne , devicetree@vger.kernel.org, Robert Beckett , Sebastian Fricke , linux-arm-kernel@lists.infradead.org, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org X-Mailer: b4 0.11.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1699471762; l=1390; i=sebastian.fricke@collabora.com; s=linux-media; h=from:subject:message-id; bh=ZxxGJD9eMM+hOducG8IQEAUt1ctZIrZFPl7ACJTXwpI=; b=ULMruYYepXYnx5ZGL4Yi0xYANNcVDQIfUYv/ik3kVlgeqK+GSY0iMkrim4bQ7fwkp96nVNkrAIuV +0w4Pj09BzCLigutmVsX7EYmHYm2lxWd/1imKbSYl0IMU+WucExb X-Developer-Key: i=sebastian.fricke@collabora.com; a=ed25519; pk=pYXedPwrTtErcj7ERYeo/IpTrpe4QbJuEzSB52fslBg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231108_112951_936219_0BB941F5 X-CRM114-Status: UNSURE ( 9.80 ) X-CRM114-Notice: Please train this message. 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Darren Etheridge Add the Chips and Media wave521cl video decoder/encoder node on J721S2. This functional block also requires an SRAM buffer as a bandwidth saving temporary store so we need to add a carve out of 126K for this as specified in the documentation. Signed-off-by: Darren Etheridge --- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi index 084f8f5b6699..70ed17c4c81b 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi @@ -28,6 +28,10 @@ atf-sram@0 { reg = <0x0 0x20000>; }; + vpu_sram: vpu-sram@20000 { + reg = <0x20000 0x1f800>; + }; + tifs-sram@1f0000 { reg = <0x1f0000 0x10000>; }; @@ -716,6 +720,16 @@ main_i2c6: i2c@2060000 { status = "disabled"; }; + vpu: video-codec@4210000 { + compatible = "ti,k3-j721s2-wave521c", "cnm,wave521c"; + reg = <0x00 0x4210000 0x00 0x10000>; + interrupts = ; + clocks = <&k3_clks 179 2>; + clock-names = "vcodec"; + power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>; + sram = <&vpu_sram>; + }; + main_sdhci0: mmc@4f80000 { compatible = "ti,j721e-sdhci-8bit"; reg = <0x00 0x04f80000 0x00 0x1000>,