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 [thread overview]
Message-ID: <20190612093915.18973-1-p.zabel@pengutronix.de> (raw)
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
--
2.20.1
next reply other threads:[~2019-06-12 9:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 9:39 Philipp Zabel [this message]
2019-06-12 9:39 ` [PATCH v5 01/10] rockchip/vpu: rename from rockchip to hantro Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 02/10] media: hantro: print video device name in addition to device node Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 03/10] media: hantro: add PM runtime resume callback Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 04/10] media: hantro: make irq names configurable Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 05/10] media: hantro: add support for named register ranges Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 06/10] media: hantro: add support for separate control block Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 07/10] media: hantro: allow arbitrary number of clocks Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 08/10] media: dt-bindings: Document i.MX8MQ and i.MX8MM VPU bindings Philipp Zabel
2019-06-28 8:42 ` Hans Verkuil
2019-06-28 8:43 ` Hans Verkuil
2019-07-09 14:25 ` Rob Herring
2019-12-20 16:52 ` Adam Ford
2019-06-12 9:39 ` [PATCH v5 09/10] media: hantro: add initial i.MX8MQ support Philipp Zabel
2019-10-25 8:01 ` Hans Verkuil
2019-11-04 10:04 ` Philipp Zabel
2019-06-12 9:39 ` [PATCH v5 10/10] media: hantro: add initial i.MX8MM support (untested) Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190612093915.18973-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=boris.brezillon@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=jonas@kwiboo.se \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nicolas@ndufresne.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).