From patchwork Thu Apr 25 07:12:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 10916119 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 021DE186D for ; Thu, 25 Apr 2019 07:13:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFA9C28B1E for ; Thu, 25 Apr 2019 07:12:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3C4028BE1; Thu, 25 Apr 2019 07:12:59 +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 D88CA28B50 for ; Thu, 25 Apr 2019 07:12:58 +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=D7bSI0Yu6qnef1fb6RzAs0q3m0AbatYAmzzftl2VSa4=; b=KNiKylTLllzE9+ aGh8Zh9V+mM7vhsQZtcQAZYRr6HMktNgItr5vEvcpqXzwQU7hiA9nF2D0d4tZtx9kkeuQsGdAcudx ygyapYx5kCqiZ2yXIFKR+5722E6D0g0R01kMBo04C+eCXc6NhsMkYFeXhjABSGfdir+V8/fERivpr sJVRGi3W3AsaNC4aBvEZlmZcf5rLvO2gZ9G+HlFmN2N1LhUh0AzJdc3/XwVeBA0HGx8k/IJnG29Bs LJg2EGuOTm2VDPmVdht+w2OdSz2Fh8EMedZ1vCXbhqiv/Ly22P4APJ7tTr5jHGYqUVmB+hUuc5cXE ZSZ6kQoVE2Pwdf+uddcw==; 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 1hJYYx-0001GU-DL; Thu, 25 Apr 2019 07:12:55 +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 1hJYYt-00019x-1P for linux-rockchip@lists.infradead.org; Thu, 25 Apr 2019 07:12:53 +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 CAB9B26395D; Thu, 25 Apr 2019 08:12:45 +0100 (BST) From: Boris Brezillon To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , linux-media@vger.kernel.org Subject: [PATCH v4 00/21] Add MPEG-2 decoding to Rockchip VPU Date: Thu, 25 Apr 2019 09:12:21 +0200 Message-Id: <20190425071242.18315-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-20190425_001251_401917_1A683220 X-CRM114-Status: GOOD ( 14.59 ) 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 v4: * Fix issues in the probe/remove path preventing the driver from being unloaded/reloaded (Jonas) * Rework the media controller registration code to simplify the error/remove path (Boris) * Split the MPEG2 patches (one adding the generic code and one patch per platform) 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 (7): rockchip/vpu: Remove a useless test rockchip/vpu: Get vdev from the file arg in vidioc_querycap() rockchip/vpu: Initialize mdev->bus_info rockchip/vpu: Rename rockchip_vpu_common.h into rockchip_vpu_v4l2.h 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 (8): 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 Jonas Karlman (6): rockchip/vpu: Do not request id 0 for our video device rockchip/vpu: Add missing dont_use_autosuspend() calls rockchip/vpu: Fix/re-order probe-error/remove path rockchip/vpu: Add infra to support MPEG-2 decoding rockchip/vpu: Add MPEG2 decoding support to RK3399 rockchip/vpu: Add support for MPEG-2 decoding on RK3288 drivers/staging/media/rockchip/vpu/Kconfig | 1 + 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 | 262 +++++++ .../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 | 268 +++++++ .../staging/media/rockchip/vpu/rockchip_vpu.h | 119 +++- .../media/rockchip/vpu/rockchip_vpu_common.h | 30 +- .../media/rockchip/vpu/rockchip_vpu_drv.c | 484 ++++++++++--- .../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 + 18 files changed, 2035 insertions(+), 775 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