Message ID | 20190612093915.18973-1-p.zabel@pengutronix.de (mailing list archive) |
---|---|
Headers |
Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1hazj2-0005Uz-2P; Wed, 12 Jun 2019 09:39:24 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437583AbfFLJjW (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Wed, 12 Jun 2019 05:39:22 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:32783 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437427AbfFLJjW (ORCPT <rfc822;linux-media@vger.kernel.org>); Wed, 12 Jun 2019 05:39:22 -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.92) (envelope-from <p.zabel@pengutronix.de>) id 1haziy-00053v-Tm; Wed, 12 Jun 2019 11:39:20 +0200 From: Philipp Zabel <p.zabel@pengutronix.de> To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab <mchehab@kernel.org>, Hans Verkuil <hverkuil@xs4all.nl>, Boris Brezillon <boris.brezillon@collabora.com>, Ezequiel Garcia <ezequiel@collabora.com>, Nicolas Dufresne <nicolas@ndufresne.ca>, Jonas Karlman <jonas@kwiboo.se>, devicetree@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v5 00/10] Rename Rockchip VPU driver to Hantro, add initial i.MX8M support Date: Wed, 12 Jun 2019 11:39:05 +0200 Message-Id: <20190612093915.18973-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Series |
Rename Rockchip VPU driver to Hantro, add initial i.MX8M support
|
|
Message
Philipp Zabel
June 12, 2019, 9:39 a.m. UTC
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 v4: - Rebased onto media-tree master, RK3328 support will have to be rebased as well - Fixed duplicated num_irqs initializer in imx8mq_vpu_variant regards Philipp Philipp Zabel (10): 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: hantro: allow arbitrary number of clocks 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 | 4 +- drivers/staging/media/Makefile | 2 +- drivers/staging/media/hantro/Kconfig | 31 ++ drivers/staging/media/hantro/Makefile | 18 + .../media/{rockchip/vpu => hantro}/TODO | 0 .../vpu/rockchip_vpu.h => hantro/hantro.h} | 167 ++++--- .../hantro_drv.c} | 335 ++++++------- .../media/hantro/hantro_g1_mpeg2_dec.c | 260 ++++++++++ drivers/staging/media/hantro/hantro_g1_regs.h | 301 ++++++++++++ .../staging/media/hantro/hantro_h1_jpeg_enc.c | 125 +++++ drivers/staging/media/hantro/hantro_h1_regs.h | 154 ++++++ 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 | 310 ++++++++++++ drivers/staging/media/hantro/rk3288_vpu_hw.c | 187 ++++++++ .../{rockchip/vpu => hantro}/rk3399_vpu_hw.c | 77 +-- .../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/rk3288_vpu_hw.c | 177 ------- .../rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 125 ----- .../rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c | 261 ----------- .../media/rockchip/vpu/rk3288_vpu_regs.h | 443 ------------------ .../media/rockchip/vpu/rockchip_vpu_hw.h | 102 ---- .../media/rockchip/vpu/rockchip_vpu_jpeg.h | 14 - 33 files changed, 2050 insertions(+), 1601 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} (69%) create mode 100644 drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c create mode 100644 drivers/staging/media/hantro/hantro_g1_regs.h create mode 100644 drivers/staging/media/hantro/hantro_h1_jpeg_enc.c create mode 100644 drivers/staging/media/hantro/hantro_h1_regs.h 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 create mode 100644 drivers/staging/media/hantro/rk3288_vpu_hw.c rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw.c (65%) 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/rk3288_vpu_hw.c delete mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c delete mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c delete mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h