From patchwork Wed May 29 09:54:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 10966649 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 B60D518A6 for ; Wed, 29 May 2019 09:54:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8C54288CA for ; Wed, 29 May 2019 09:54:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D1E1288EC; Wed, 29 May 2019 09:54:38 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16D29288DD for ; Wed, 29 May 2019 09:54:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726643AbfE2Jyh (ORCPT ); Wed, 29 May 2019 05:54:37 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:52543 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725990AbfE2Jyd (ORCPT ); Wed, 29 May 2019 05:54:33 -0400 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.89) (envelope-from ) id 1hVvHz-0002DF-1N; Wed, 29 May 2019 11:54:31 +0200 From: Philipp Zabel To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Hans Verkuil , Boris Brezillon , Ezequiel Garcia , Nicolas Dufresne , Jonas Karlman , devicetree@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v2 0/9] Rename Rockchip VPU driver to Hantro, add initial i.MX8M support Date: Wed, 29 May 2019 11:54:15 +0200 Message-Id: <20190529095424.23614-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are several other SoCs that contain Hantro IP based VPUs, such as NXP i.MX8MQ (Hantro G1 and G2) and i.MX8MM (Hantro G1, G2, and H1). To maximize code sharing, add initial support for these SoCs to the Rockchip VPU driver, after renaming it to Hantro VPU. This series is based on the br-v5.3g tag, commit e568d2cc1ef6 ("rockchip/vpu: Add support for MPEG-2 decoding on RK3288") with https://patchwork.linuxtv.org/patch/56402/ ("rockchip/vpu: Add support for MPEG-2 decoding on RK3328") applied on top. It supports MPEG-2 decoding on i.MX8MQ. MPEG-2 decoding and JPEG encoding on i.MX8MM may or may not work, I don't have the hardware to test. Changes since v1: - Rebased onto "[PATCH v6] Add MPEG-2 decoding to Rockchip VPU" series, dropped deprecated patch [1]. [1] https://patchwork.linuxtv.org/patch/56278/ regards Philipp Philipp Zabel (9): rockchip/vpu: rename from rockchip to hantro media: hantro: print video device name in addition to device node media: hantro: add PM runtime resume callback media: hantro: make irq names configurable media: hantro: add support for named register ranges media: hantro: add support for separate control block media: dt-bindings: Document i.MX8MQ and i.MX8MM VPU bindings media: hantro: add initial i.MX8MQ support media: hantro: add initial i.MX8MM support (untested) .../devicetree/bindings/media/imx8m-vpu.txt | 56 +++ MAINTAINERS | 4 +- drivers/staging/media/Kconfig | 2 +- drivers/staging/media/Makefile | 2 +- drivers/staging/media/hantro/Kconfig | 15 + drivers/staging/media/hantro/Makefile | 14 + .../media/{rockchip/vpu => hantro}/TODO | 0 .../vpu/rockchip_vpu.h => hantro/hantro.h} | 158 +++++---- .../hantro_drv.c} | 325 +++++++++--------- .../hantro_g1_mpeg2_dec.c} | 55 ++- .../hantro_h1_jpeg_enc.c} | 44 +-- drivers/staging/media/hantro/hantro_hw.h | 104 ++++++ .../hantro_jpeg.c} | 18 +- drivers/staging/media/hantro/hantro_jpeg.h | 13 + .../hantro_mpeg2.c} | 14 +- .../hantro_v4l2.c} | 234 ++++++------- .../hantro_v4l2.h} | 16 +- drivers/staging/media/hantro/imx8m_vpu_hw.c | 301 ++++++++++++++++ .../{rockchip/vpu => hantro}/rk3288_vpu_hw.c | 69 ++-- .../vpu => hantro}/rk3288_vpu_regs.h | 2 +- .../{rockchip/vpu => hantro}/rk3399_vpu_hw.c | 73 ++-- .../vpu => hantro}/rk3399_vpu_hw_jpeg_enc.c | 32 +- .../vpu => hantro}/rk3399_vpu_hw_mpeg2_dec.c | 37 +- .../vpu => hantro}/rk3399_vpu_regs.h | 2 +- drivers/staging/media/rockchip/vpu/Kconfig | 14 - drivers/staging/media/rockchip/vpu/Makefile | 14 - .../media/rockchip/vpu/rockchip_vpu_hw.h | 103 ------ .../media/rockchip/vpu/rockchip_vpu_jpeg.h | 14 - 28 files changed, 1057 insertions(+), 678 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/imx8m-vpu.txt create mode 100644 drivers/staging/media/hantro/Kconfig create mode 100644 drivers/staging/media/hantro/Makefile rename drivers/staging/media/{rockchip/vpu => hantro}/TODO (100%) rename drivers/staging/media/{rockchip/vpu/rockchip_vpu.h => hantro/hantro.h} (66%) rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_drv.c => hantro/hantro_drv.c} (70%) rename drivers/staging/media/{rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c => hantro/hantro_g1_mpeg2_dec.c} (87%) rename drivers/staging/media/{rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c => hantro/hantro_h1_jpeg_enc.c} (76%) create mode 100644 drivers/staging/media/hantro/hantro_hw.h rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_jpeg.c => hantro/hantro_jpeg.c} (95%) create mode 100644 drivers/staging/media/hantro/hantro_jpeg.h rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_mpeg2.c => hantro/hantro_mpeg2.c} (79%) rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_v4l2.c => hantro/hantro_v4l2.c} (69%) rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_v4l2.h => hantro/hantro_v4l2.h} (53%) create mode 100644 drivers/staging/media/hantro/imx8m_vpu_hw.c rename drivers/staging/media/{rockchip/vpu => hantro}/rk3288_vpu_hw.c (66%) rename drivers/staging/media/{rockchip/vpu => hantro}/rk3288_vpu_regs.h (99%) rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw.c (67%) rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw_jpeg_enc.c (86%) rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw_mpeg2_dec.c (92%) rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_regs.h (99%) delete mode 100644 drivers/staging/media/rockchip/vpu/Kconfig delete mode 100644 drivers/staging/media/rockchip/vpu/Makefile delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h