From patchwork Mon Apr 22 08:08:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 10910781 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A07BB1515 for ; Mon, 22 Apr 2019 08:08:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91C882855C for ; Mon, 22 Apr 2019 08:08:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8594B285F9; Mon, 22 Apr 2019 08:08:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 15B17285F7 for ; Mon, 22 Apr 2019 08:08:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=btRWWtRYWuJhn8PmtKQmjCLKwpJyNcn+NRskqfPTmAY=; b=GMNGPPixHdGKZ/ c8caSePYvpnujs5sU1miGUfesImqoeIe7EWEzAbB0O8xK2UqKtm3yZ9LD7x6ApeUerLOK24Dpo/3A wYt2XD0/YX67/dw//bwDLHopELi67QOTtgEeT0kDCHVpfUDAMcE2tNeY2MTt5jZRgq6OMpZcIKhRD jaHvgIKgF6xR10M6QIBpcCYOlemRRQxSBs8oc/Z7Tl4UQPPf9PGPORc5MplqfrzltnUaMPrkwd4xp Go0/tO0i3gsKu0xUt0V3ewCvbYecLG5uqOCBW7g2r+NbYdjASo2f+8uzEAY8Ukaq0YrARNCvo/Qg/ vL66AN9QUvKGi0aKn9qA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIU05-0008QQ-Hj; Mon, 22 Apr 2019 08:08:29 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIU01-0008Mm-7M for linux-rockchip@lists.infradead.org; Mon, 22 Apr 2019 08:08:27 +0000 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id AE16626070C; Mon, 22 Apr 2019 09:08:21 +0100 (BST) From: Boris Brezillon To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , linux-media@vger.kernel.org Subject: [PATCH v3 00/15] Add MPEG-2 decoding to Rockchip VPU Date: Mon, 22 Apr 2019 10:08:03 +0200 Message-Id: <20190422080818.29130-1-boris.brezillon@collabora.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190422_010825_520735_AB1B0750 X-CRM114-Status: GOOD ( 13.54 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomasz Figa , Heiko Stuebner , Jonas Karlman , Nicolas Dufresne , Paul Kocialkowski , linux-rockchip@lists.infradead.org, Boris Brezillon , kernel@collabora.com, Ezequiel Garcia Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This series introduces the decoding infrastructure that will be used to add support for other codecs such as VP8, VP9 and H.264. As explained in the cover letter for the v1 patchset, the driver is now exposing two video device nodes. The VPU encoder is exposed on /dev/video0, and the VPU decoder is exposed on /dev/video1. Both devices are tied to the same memory-to-memory queue, and same media device /dev/media0. Therefore there are two media graphs: ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-source │ │ /dev/video0 │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-proc │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-sink │ │ /dev/video0 │ └────────────────────────────────┘ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-source │ │ /dev/video1 │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-proc │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-sink │ │ /dev/video1 │ └────────────────────────────────┘ Of course, this work has been possible thanks to Jonas Karlman, who did the initial MPEG-2 decoding work and also got mpv+ffmpeg working using the Request API. Regards, Boris v3: * Share more code between the encoder/decoder logic (VB2/V4L2 interface implementation) * Add a patch to support MPEG2 decoding on RK3288 (Jonas) * Several fixes/improvements all over the place (see changelog in each patch for more details) v2: * Fixed some minor issues brought up by v4l2-compliance. * Fixed bytesused wrongly assigned 0 on the MPEG-2 decoder. * Addressed comments from Hans and Tomasz on the pixel format helpers. Boris Brezillon (5): rockchip/vpu: Rename rockchip_vpu_common.h into rockchip_vpu_v4l2.h rockchip/vpu: Remove a useless test rockchip/vpu: Move encoder logic to a common place rockchip/vpu: Provide a helper to reset both src and dst formats rockchip/vpu: Prepare things to support decoders Ezequiel Garcia (9): rockchip/vpu: Use pixel format helpers rockchip/vpu: Use v4l2_m2m_buf_copy_metadata rockchip/vpu: Cleanup macroblock alignment rockchip/vpu: Cleanup JPEG bounce buffer management rockchip/vpu: Open-code media controller register rockchip/vpu: Support the Request API rockchip/vpu: Add decoder boilerplate rockchip/vpu: Add support for non-standard controls rockchip/vpu: Add support for MPEG-2 decoding Jonas Karlman (1): rockchip/vpu: Add support for MPEG-2 decoding on RK3288 drivers/staging/media/rockchip/vpu/Makefile | 7 +- .../media/rockchip/vpu/rk3288_vpu_hw.c | 61 +- .../rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +- .../rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c | 257 +++++++ .../media/rockchip/vpu/rk3288_vpu_regs.h | 1 + .../media/rockchip/vpu/rk3399_vpu_hw.c | 61 +- .../rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 12 +- .../rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c | 273 +++++++ .../staging/media/rockchip/vpu/rockchip_vpu.h | 115 ++- .../media/rockchip/vpu/rockchip_vpu_common.h | 30 +- .../media/rockchip/vpu/rockchip_vpu_drv.c | 456 ++++++++++-- .../media/rockchip/vpu/rockchip_vpu_enc.c | 670 ------------------ .../media/rockchip/vpu/rockchip_vpu_hw.h | 44 ++ .../media/rockchip/vpu/rockchip_vpu_jpeg.c | 29 + .../media/rockchip/vpu/rockchip_vpu_mpeg2.c | 61 ++ .../media/rockchip/vpu/rockchip_vpu_v4l2.c | 668 +++++++++++++++++ .../media/rockchip/vpu/rockchip_vpu_v4l2.h | 26 + 17 files changed, 2016 insertions(+), 761 deletions(-) create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.h