Skip to contentSkip to conversation

hantro: set of small cleanups and fixes

PATCH In review Ezequiel Garcia 4 participants 20 messages Mar 25, 2020 – Apr 21, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v3 cover hantro: set of small cleanups and fixes

Hi all,

Cleanups and fixes, third iteration.

The main idea here is to address two issues, and while at it, clean the driver a bit.

The first issue can be found in Patch 1, when the Request API is used, the CAPTURE buffer should be returned _before_ the OUTPUT buffer, to avoid waking up userspace prematurely.

I noticed this issue while working on the rkvdec driver, but this time I've decided to tackle it at the core, in v4l2_m2m_buf_done_and_job_finish().

The second issue is a simple compliance issue, which is solved by refactoring the driver, dealing with internal set format properly.

Note that patch 7 still needs reviews from device tree maintainers.

Changes v3:

* Rebased media master.

* Revert buffer sequence removal change.

Changes v2:

* Fix compile warning introduced by patch 6.

* I'm adding two additional patches this time.
Patch 7 converts the binding to json-schema,
and patch 8 puts linux-rockchip mailing list in MAINTAINERS.

Thanks,
Ezequiel

Ezequiel Garcia (7):
v4l2-mem2mem: return CAPTURE buffer first
hantro: Set buffers' zeroth plane payload in .buf_prepare
hantro: Use v4l2_m2m_buf_done_and_job_finish
hantro: Remove unneeded hantro_dec_buf_finish
hantro: Move H264 motion vector calculation to a helper
hantro: Refactor for V4L2 API spec compliancy
dt-bindings: rockchip-vpu: Convert bindings to json-schema

 .../bindings/media/rockchip-vpu.txt           |  43 -------
 .../bindings/media/rockchip-vpu.yaml          |  82 +++++++++++++
 MAINTAINERS                                   |   2 +-
 drivers/media/v4l2-core/v4l2-mem2mem.c        |  11 +-
 drivers/staging/media/hantro/hantro.h         |   7 +-
 drivers/staging/media/hantro/hantro_drv.c     |  28 ++---
 drivers/staging/media/hantro/hantro_hw.h      |  31 +++++
 drivers/staging/media/hantro/hantro_v4l2.c    | 111 +++++++++---------
 8 files changed, 193 insertions(+), 122 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml
Signature · 1 line
2.26.0.rc2
#1 lore raw

PATCH v3 1/7 v4l2-mem2mem: return CAPTURE buffer first

When the request API is used, typically an OUTPUT (src) buffer will be part of a request. A userspace process will be typically blocked, waiting on the request file descriptor.

Returning the OUTPUT (src) buffer will wake-up such processes, who will immediately attempt to dequeue the CAPTURE buffer, only to find it's still unavailable.

Therefore, change v4l2_m2m_buf_done_and_job_finish returning the CAPTURE (dst) buffer first, to avoid signalling the request file descriptor prematurely, i.e. before the CAPTURE buffer is done.

When the request API is not used, this change should have no impact.

---
 drivers/media/v4l2-core/v4l2-mem2mem.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +10 -1
index 8986c31176e9..62ac9424c92a 100644
@@ -504,12 +504,21 @@ void v4l2_m2m_buf_done_and_job_finish(struct v4l2_m2m_dev *m2m_dev,
 
 	if (WARN_ON(!src_buf || !dst_buf))
 		goto unlock;
-	v4l2_m2m_buf_done(src_buf, state);
 	dst_buf->is_held = src_buf->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
 	if (!dst_buf->is_held) {
 		v4l2_m2m_dst_buf_remove(m2m_ctx);
 		v4l2_m2m_buf_done(dst_buf, state);
 	}
+	/*
+	 * If the request API is being used, returning the OUTPUT
+	 * (src) buffer will wake-up any process waiting on the
+	 * request file descriptor.
+	 *
+	 * Therefore, return the CAPTURE (dst) buffer first,
+	 * to avoid signalling the request file descriptor
+	 * before the CAPTURE buffer is done.
+	 */
+	v4l2_m2m_buf_done(src_buf, state);
 	schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx);
 unlock:
 	spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
Signature · 1 line
2.26.0.rc2
#2 lore raw

PATCH v3 2/7 hantro: Set buffers' zeroth plane payload in .buf_prepare

In reply to Ezequiel Garcia

Buffers' zeroth plane payload size is calculated at format negotiation time, and so it can be set in .buf_prepare.

Keep in mind that, to make this change easier, hantro_buf_prepare is refactored, using the cedrus driver as reference. This results in cleaner code as byproduct.

---
 drivers/staging/media/hantro/hantro_v4l2.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/staging/media/hantro/hantro_v4l2.c +11 -5
index f4ae2cee0f18..3142ab6697d5 100644
@@ -608,7 +608,7 @@ hantro_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
 }
 
 static int
-hantro_buf_plane_check(struct vb2_buffer *vb, const struct hantro_fmt *vpu_fmt,
+hantro_buf_plane_check(struct vb2_buffer *vb,
 		       struct v4l2_pix_format_mplane *pixfmt)
 {
 	unsigned int sz;
@@ -630,12 +630,18 @@ static int hantro_buf_prepare(struct vb2_buffer *vb)
 {
 	struct vb2_queue *vq = vb->vb2_queue;
 	struct hantro_ctx *ctx = vb2_get_drv_priv(vq);
+	struct v4l2_pix_format_mplane *pix_fmt;
+	int ret;
 
 	if (V4L2_TYPE_IS_OUTPUT(vq->type))
-		return hantro_buf_plane_check(vb, ctx->vpu_src_fmt,
-						  &ctx->src_fmt);
-
-	return hantro_buf_plane_check(vb, ctx->vpu_dst_fmt, &ctx->dst_fmt);
+		pix_fmt = &ctx->src_fmt;
+	else
+		pix_fmt = &ctx->dst_fmt;
+	ret = hantro_buf_plane_check(vb, pix_fmt);
+	if (ret)
+		return ret;
+	vb2_set_plane_payload(vb, 0, pix_fmt->plane_fmt[0].sizeimage);
+	return 0;
 }
 
 static void hantro_buf_queue(struct vb2_buffer *vb)
Signature · 1 line
2.26.0.rc2
#3 lore raw

PATCH v3 3/7 hantro: Use v4l2_m2m_buf_done_and_job_finish

In reply to Ezequiel Garcia

Let the core sort out the nuances of returning buffers to userspace, by using the v4l2_m2m_buf_done_and_job_finish helper.

--

 drivers/staging/media/hantro/hantro_drv.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/media/hantro/hantro_drv.c +9 -9
index ace13973e2d0..d0097c5fe7d9 100644
@@ -101,8 +101,8 @@ static void hantro_job_finish(struct hantro_dev *vpu,
 	pm_runtime_put_autosuspend(vpu->dev);
 	clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks);
 
-	src = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-	dst = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
+	src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+	dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
 
 	if (WARN_ON(!src))
 		return;
@@ -112,14 +112,14 @@ static void hantro_job_finish(struct hantro_dev *vpu,
 	src->sequence = ctx->sequence_out++;
 	dst->sequence = ctx->sequence_cap++;
 
-	ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
-	if (ret)
-		result = VB2_BUF_STATE_ERROR;
-
-	v4l2_m2m_buf_done(src, result);
-	v4l2_m2m_buf_done(dst, result);
+	if (ctx->buf_finish) {
+		ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
+		if (ret)
+			result = VB2_BUF_STATE_ERROR;
+	}
 
-	v4l2_m2m_job_finish(vpu->m2m_dev, ctx->fh.m2m_ctx);
+	v4l2_m2m_buf_done_and_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx,
+					 result);
 }
 
 void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused,
Signature · 1 line
2.26.0.rc2
#4 lore raw

PATCH v3 4/7 hantro: Remove unneeded hantro_dec_buf_finish

In reply to Ezequiel Garcia

Since now .buf_prepare takes care of setting the
buffer payload size, we can get rid of this,
at least for decoders.

---
 drivers/staging/media/hantro/hantro_drv.c | 10 ----------
 1 file changed, 10 deletions(-)
drivers/staging/media/hantro/hantro_drv.c +0 -10
index d0097c5fe7d9..0db8ad455160 100644
@@ -80,15 +80,6 @@ hantro_enc_buf_finish(struct hantro_ctx *ctx, struct vb2_buffer *buf,
 	return 0;
 }
 
-static int
-hantro_dec_buf_finish(struct hantro_ctx *ctx, struct vb2_buffer *buf,
-		      unsigned int bytesused)
-{
-	/* For decoders set bytesused as per the output picture. */
-	buf->planes[0].bytesused = ctx->dst_fmt.plane_fmt[0].sizeimage;
-	return 0;
-}
-
 static void hantro_job_finish(struct hantro_dev *vpu,
 			      struct hantro_ctx *ctx,
 			      unsigned int bytesused,
@@ -431,7 +422,6 @@ static int hantro_open(struct file *filp)
 		ctx->buf_finish = hantro_enc_buf_finish;
 	} else if (func->id == MEDIA_ENT_F_PROC_VIDEO_DECODER) {
 		allowed_codecs = vpu->variant->codec & HANTRO_DECODERS;
-		ctx->buf_finish = hantro_dec_buf_finish;
 	} else {
 		ret = -ENODEV;
 		goto err_ctx_free;
Signature · 1 line
2.26.0.rc2
#5 lore raw

PATCH v3 5/7 hantro: Move H264 motion vector calculation to a helper

In reply to Ezequiel Garcia

Move the extra bytes calculation that are needed for H264 motion vector to a helper. This is just a cosmetic cleanup.

---
 drivers/staging/media/hantro/hantro.h      |  4 ---
 drivers/staging/media/hantro/hantro_hw.h   | 31 ++++++++++++++++++++++
 drivers/staging/media/hantro/hantro_v4l2.c | 25 ++---------------
 3 files changed, 33 insertions(+), 27 deletions(-)
drivers/staging/media/hantro/hantro.h +0 -4
index 327ddef45345..2089f88a44a2 100644
@@ -26,10 +26,6 @@
 
 #include "hantro_hw.h"
 
-#define MB_DIM			16
-#define MB_WIDTH(w)		DIV_ROUND_UP(w, MB_DIM)
-#define MB_HEIGHT(h)		DIV_ROUND_UP(h, MB_DIM)
-
 struct hantro_ctx;
 struct hantro_codec_ops;
 
drivers/staging/media/hantro/hantro_hw.h +31 -0
index 7dfc9bad7297..4053d8710e04 100644
@@ -18,6 +18,10 @@
 
 #define DEC_8190_ALIGN_MASK	0x07U
 
+#define MB_DIM			16
+#define MB_WIDTH(w)		DIV_ROUND_UP(w, MB_DIM)
+#define MB_HEIGHT(h)		DIV_ROUND_UP(h, MB_DIM)
+
 struct hantro_dev;
 struct hantro_ctx;
 struct hantro_buf;
@@ -176,6 +180,33 @@ void hantro_g1_h264_dec_run(struct hantro_ctx *ctx);
 int hantro_h264_dec_init(struct hantro_ctx *ctx);
 void hantro_h264_dec_exit(struct hantro_ctx *ctx);
 
+static inline size_t
+hantro_h264_mv_size(unsigned int width, unsigned int height)
+{
+	/*
+	 * A decoded 8-bit 4:2:0 NV12 frame may need memory for up to
+	 * 448 bytes per macroblock with additional 32 bytes on
+	 * multi-core variants.
+	 *
+	 * The H264 decoder needs extra space on the output buffers
+	 * to store motion vectors. This is needed for reference
+	 * frames and only if the format is non-post-processed NV12.
+	 *
+	 * Memory layout is as follow:
+	 *
+	 * +---------------------------+
+	 * | Y-plane   256 bytes x MBs |
+	 * +---------------------------+
+	 * | UV-plane  128 bytes x MBs |
+	 * +---------------------------+
+	 * | MV buffer  64 bytes x MBs |
+	 * +---------------------------+
+	 * | MC sync          32 bytes |
+	 * +---------------------------+
+	 */
+	return 64 * MB_WIDTH(width) * MB_WIDTH(height) + 32;
+}
+
 void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx);
 void rk3399_vpu_mpeg2_dec_run(struct hantro_ctx *ctx);
 void hantro_mpeg2_dec_copy_qtable(u8 *qtable,
drivers/staging/media/hantro/hantro_v4l2.c +2 -23
index 3142ab6697d5..458b502ff01b 100644
@@ -273,32 +273,11 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f,
 		/* Fill remaining fields */
 		v4l2_fill_pixfmt_mp(pix_mp, fmt->fourcc, pix_mp->width,
 				    pix_mp->height);
-		/*
-		 * A decoded 8-bit 4:2:0 NV12 frame may need memory for up to
-		 * 448 bytes per macroblock with additional 32 bytes on
-		 * multi-core variants.
-		 *
-		 * The H264 decoder needs extra space on the output buffers
-		 * to store motion vectors. This is needed for reference
-		 * frames and only if the format is non-post-processed NV12.
-		 *
-		 * Memory layout is as follow:
-		 *
-		 * +---------------------------+
-		 * | Y-plane   256 bytes x MBs |
-		 * +---------------------------+
-		 * | UV-plane  128 bytes x MBs |
-		 * +---------------------------+
-		 * | MV buffer  64 bytes x MBs |
-		 * +---------------------------+
-		 * | MC sync          32 bytes |
-		 * +---------------------------+
-		 */
 		if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_H264_SLICE &&
 		    !hantro_needs_postproc(ctx, fmt))
 			pix_mp->plane_fmt[0].sizeimage +=
-				64 * MB_WIDTH(pix_mp->width) *
-				     MB_WIDTH(pix_mp->height) + 32;
+				hantro_h264_mv_size(pix_mp->width,
+						    pix_mp->height);
 	} else if (!pix_mp->plane_fmt[0].sizeimage) {
 		/*
 		 * For coded formats the application can specify
Signature · 1 line
2.26.0.rc2
#6 lore raw

PATCH v3 6/7 hantro: Refactor for V4L2 API spec compliancy

In reply to Ezequiel Garcia

Refactor how S_FMT and TRY_FMT are handled, and also make sure internal initial format and format reset are done properly.

The latter is achieved by making sure the same hantro_{set,try}_fmt helpers are called on all paths that set the format (which is part of the driver state).

This commit removes the following v4l2-compliance warnings:

test VIDIOC_G_FMT: OK

	fail: v4l2-test-formats.cpp(711): Video Capture Multiplanar: TRY_FMT(G_FMT) != G_FMT
test VIDIOC_TRY_FMT: FAIL
	fail: v4l2-test-formats.cpp(1116): Video Capture Multiplanar: S_FMT(G_FMT) != G_FMT

test VIDIOC_S_FMT: FAIL

---
 drivers/staging/media/hantro/hantro.h      |  3 +-
 drivers/staging/media/hantro/hantro_v4l2.c | 70 ++++++++++++++--------
 2 files changed, 47 insertions(+), 26 deletions(-)
drivers/staging/media/hantro/hantro.h +2 -1
index 2089f88a44a2..3005207fc6fb 100644
@@ -417,7 +417,8 @@ hantro_get_dst_buf(struct hantro_ctx *ctx)
 }
 
 static inline bool
-hantro_needs_postproc(struct hantro_ctx *ctx, const struct hantro_fmt *fmt)
+hantro_needs_postproc(const struct hantro_ctx *ctx,
+		      const struct hantro_fmt *fmt)
 {
 	return !hantro_is_encoder_ctx(ctx) && fmt->fourcc != V4L2_PIX_FMT_NV12;
 }
drivers/staging/media/hantro/hantro_v4l2.c +45 -25

147 lines not on this page · raw message

Signature · 1 line
2.26.0.rc2
#7 lore raw

PATCH v3 7/7 dt-bindings: rockchip-vpu: Convert bindings to json-schema

In reply to Ezequiel Garcia

Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema.

---
 .../bindings/media/rockchip-vpu.txt           | 43 ----------
 .../bindings/media/rockchip-vpu.yaml          | 82 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 83 insertions(+), 44 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml
Documentation/devicetree/bindings/media/rockchip-vpu.txt deleted +0 -43
deleted file mode 100644
index 339252d9c515..000000000000
@@ -1,43 +0,0 @@
-device-tree bindings for rockchip VPU codec
-
-Rockchip (Video Processing Unit) present in various Rockchip platforms,
-such as RK3288, RK3328 and RK3399.
-
-Required properties:
-- compatible: value should be one of the following
-		"rockchip,rk3288-vpu";
-		"rockchip,rk3328-vpu";
-		"rockchip,rk3399-vpu";
-- interrupts: encoding and decoding interrupt specifiers
-- interrupt-names: should be
-		"vepu", "vdpu" on RK3288 and RK3399,
-		"vdpu" on RK3328.
-- clocks: phandle to VPU aclk, hclk clocks
-- clock-names: should be "aclk" and "hclk"
-- power-domains: phandle to power domain node
-- iommus: phandle to a iommu node
-
-Example:
-SoC-specific DT entry:
-	vpu: video-codec@ff9a0000 {
-		compatible = "rockchip,rk3288-vpu";
-		reg = <0x0 0xff9a0000 0x0 0x800>;
-		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vepu", "vdpu";
-		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-		clock-names = "aclk", "hclk";
-		power-domains = <&power RK3288_PD_VIDEO>;
-		iommus = <&vpu_mmu>;
-	};
-
-	vpu: video-codec@ff350000 {
-		compatible = "rockchip,rk3328-vpu";
-		reg = <0x0 0xff350000 0x0 0x800>;
-		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vdpu";
-		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-		clock-names = "aclk", "hclk";
-		power-domains = <&power RK3328_PD_VPU>;
-		iommus = <&vpu_mmu>;
-	};
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +82 -0

82 lines not on this page · raw message

MAINTAINERS +1 -1
index d66ac41ef587..2b8b3e7f3df3 100644
@@ -14320,7 +14320,7 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/staging/media/hantro/
 F:	Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
-F:	Documentation/devicetree/bindings/media/rockchip-vpu.txt
+F:	Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 
 ROCKER DRIVER
 M:	Jiri Pirko <[email protected]>
Signature · 1 line
2.26.0.rc2
maintainer
#8 lore raw

Re: [PATCH v3 7/7] dt-bindings: rockchip-vpu: Convert bindings to json-schema

Quoted 6 lines · Ezequiel Garcia

Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema.

Quoted 8 lines
---
 .../bindings/media/rockchip-vpu.txt           | 43 ----------
 .../bindings/media/rockchip-vpu.yaml          | 82 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 83 insertions(+), 44 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml

My bot found errors running 'make dt_binding_check' on your patch:

Error: Documentation/devicetree/bindings/media/rockchip-vpu.example.dts:28.41-42 syntax error
FATAL ERROR: Unable to parse input tree
scripts/Makefile.lib:311: recipe for target 'Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml' failed make[1]: *** [Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml] Error 1
make[1]: *** Waiting for unfinished jobs....
Makefile:1262: recipe for target 'dt_binding_check' failed
make: *** [dt_binding_check] Error 2

See https://patchwork.ozlabs.org/patch/1261669

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:

pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade

Please check and re-submit.

#9 lore raw

Re: [PATCH v3 7/7] dt-bindings: rockchip-vpu: Convert bindings to json-schema

Quoted 26 lines · Rob Herring
Quoted 6 lines · Ezequiel Garcia

Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema.

Cc Mark Rutland <[email protected]>
Cc Rob Herring <[email protected]>
Quoted 8 lines
---
 .../bindings/media/rockchip-vpu.txt           | 43 ----------
 .../bindings/media/rockchip-vpu.yaml          | 82 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 83 insertions(+), 44 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml

My bot found errors running 'make dt_binding_check' on your patch:

Error: Documentation/devicetree/bindings/media/rockchip-vpu.example.dts:28.41-42 syntax error
FATAL ERROR: Unable to parse input tree
scripts/Makefile.lib:311: recipe for target 'Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml' failed make[1]: *** [Documentation/devicetree/bindings/media/rockchip-vpu.example.dt.yaml] Error 1
make[1]: *** Waiting for unfinished jobs....
Makefile:1262: recipe for target 'dt_binding_check' failed
make: *** [dt_binding_check] Error 2

Quoted 9 lines

See https://patchwork.ozlabs.org/patch/1261669

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date:

pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade

Please check and re-submit.

Sure, I will.

Sorry about that!

Ezequiel

maintainer
#10 lore raw

Re: [PATCH v3 7/7] dt-bindings: rockchip-vpu: Convert bindings to json-schema

In reply to Ezequiel Garcia
Quoted 114 lines · Ezequiel Garcia

Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema.

---
 .../bindings/media/rockchip-vpu.txt           | 43 ----------
 .../bindings/media/rockchip-vpu.yaml          | 82 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 83 insertions(+), 44 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml
Documentation/devicetree/bindings/media/rockchip-vpu.txt deleted +0 -43
deleted file mode 100644
index 339252d9c515..000000000000
@@ -1,43 +0,0 @@
-device-tree bindings for rockchip VPU codec
-
-Rockchip (Video Processing Unit) present in various Rockchip platforms,
-such as RK3288, RK3328 and RK3399.
-
-Required properties:
-- compatible: value should be one of the following
-               "rockchip,rk3288-vpu";
-               "rockchip,rk3328-vpu";
-               "rockchip,rk3399-vpu";
-- interrupts: encoding and decoding interrupt specifiers
-- interrupt-names: should be
-               "vepu", "vdpu" on RK3288 and RK3399,
-               "vdpu" on RK3328.
-- clocks: phandle to VPU aclk, hclk clocks
-- clock-names: should be "aclk" and "hclk"
-- power-domains: phandle to power domain node
-- iommus: phandle to a iommu node
-
-Example:
-SoC-specific DT entry:
-       vpu: video-codec@ff9a0000 {
-               compatible = "rockchip,rk3288-vpu";
-               reg = <0x0 0xff9a0000 0x0 0x800>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "vepu", "vdpu";
-               clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-               clock-names = "aclk", "hclk";
-               power-domains = <&power RK3288_PD_VIDEO>;
-               iommus = <&vpu_mmu>;
-       };
-
-       vpu: video-codec@ff350000 {
-               compatible = "rockchip,rk3328-vpu";
-               reg = <0x0 0xff350000 0x0 0x800>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "vdpu";
-               clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-               clock-names = "aclk", "hclk";
-               power-domains = <&power RK3328_PD_VPU>;
-               iommus = <&vpu_mmu>;
-       };
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +44 -0
new file mode 100644
index 000000000000..a0c45e05cf03
@@ -0,0 +1,82 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/rockchip-vpu.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Hantro G1 VPU codecs implemented on Rockchip SoCs
+
+maintainers:
+  - Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
+
+description:
+  Hantro G1 video encode and decode accelerators present on Rockchip SoCs.
+
+properties:
+  compatible:
+    enum:
+      - rockchip,rk3288-vpu
+      - rockchip,rk3328-vpu
+      - rockchip,rk3399-vpu
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 2
+
+  interrupt-names:
+    items:
+      - const: vepu
+      - const: vdpu
+
+  clocks:
+    maxItems: 2
+
+  clock-names:
+    items:
+      - const: aclk
+      - const: hclk
+
+  power-domains:
+    maxItems: 1
+

Documentation/devicetree/bindings/media/rockchip-vpu.yaml line 54

Quoted 10 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +10 -0
+  iommus:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - interrupt-names
+  - clocks
+  - clock-names

Add:

additionalProperties: false

Quoted 5 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +5 -0
+
+examples:
+  - |
+        #include <dt-bindings/clock/rk3288-cru.h>
+        #include <dt-bindings/interrupt-controller/arm-gic.h>

Documentation/devicetree/bindings/media/rockchip-vpu.yaml line 69

Quoted 10 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +10 -0
+
+        vpu: video-codec@ff9a0000 {
+                compatible = "rockchip,rk3288-vpu";
+                reg = <0x0 0xff9a0000 0x0 0x800>;
+                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "vepu", "vdpu";
+                clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+                clock-names = "aclk", "hclk";
+                power-domains = <&power RK3288_PD_VIDEO>;

Header for this define?

Quoted 29 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +13 -0
+                iommus = <&vpu_mmu>;
+        };
+
+        vpu: video-codec@ff350000 {
+                compatible = "rockchip,rk3328-vpu";
+                reg = <0x0 0xff350000 0x0 0x800>;
+                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "vdpu";
+                clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
+                clock-names = "aclk", "hclk";
+                power-domains = <&power RK3328_PD_VPU>;
+                iommus = <&vpu_mmu>;
+        };
MAINTAINERS +1 -2
index d66ac41ef587..2b8b3e7f3df3 100644
@@ -14320,7 +14320,7 @@ L:      [email protected]
 S:     Maintained
 F:     drivers/staging/media/hantro/
 F:     Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
-F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
+F:     Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 
 ROCKER DRIVER
 M:     Jiri Pirko <[email protected]>
--

2.26.0.rc2

#11 lore raw

Re: [PATCH v3 7/7] dt-bindings: rockchip-vpu: Convert bindings to json-schema

Hey Rob,

Quoted 127 lines · Rob Herring
Quoted 113 lines · Ezequiel Garcia

Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema.

---
 .../bindings/media/rockchip-vpu.txt           | 43 ----------
 .../bindings/media/rockchip-vpu.yaml          | 82 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 83 insertions(+), 44 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml
Documentation/devicetree/bindings/media/rockchip-vpu.txt deleted +0 -43
deleted file mode 100644
index 339252d9c515..000000000000
@@ -1,43 +0,0 @@
-device-tree bindings for rockchip VPU codec
-
-Rockchip (Video Processing Unit) present in various Rockchip platforms,
-such as RK3288, RK3328 and RK3399.
-
-Required properties:
-- compatible: value should be one of the following
-               "rockchip,rk3288-vpu";
-               "rockchip,rk3328-vpu";
-               "rockchip,rk3399-vpu";
-- interrupts: encoding and decoding interrupt specifiers
-- interrupt-names: should be
-               "vepu", "vdpu" on RK3288 and RK3399,
-               "vdpu" on RK3328.
-- clocks: phandle to VPU aclk, hclk clocks
-- clock-names: should be "aclk" and "hclk"
-- power-domains: phandle to power domain node
-- iommus: phandle to a iommu node
-
-Example:
-SoC-specific DT entry:
-       vpu: video-codec@ff9a0000 {
-               compatible = "rockchip,rk3288-vpu";
-               reg = <0x0 0xff9a0000 0x0 0x800>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "vepu", "vdpu";
-               clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-               clock-names = "aclk", "hclk";
-               power-domains = <&power RK3288_PD_VIDEO>;
-               iommus = <&vpu_mmu>;
-       };
-
-       vpu: video-codec@ff350000 {
-               compatible = "rockchip,rk3328-vpu";
-               reg = <0x0 0xff350000 0x0 0x800>;
-               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "vdpu";
-               clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-               clock-names = "aclk", "hclk";
-               power-domains = <&power RK3328_PD_VPU>;
-               iommus = <&vpu_mmu>;
-       };
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +44 -0
new file mode 100644
index 000000000000..a0c45e05cf03
@@ -0,0 +1,82 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/media/rockchip-vpu.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Hantro G1 VPU codecs implemented on Rockchip SoCs
+
+maintainers:
+  - Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
+
+description:
+  Hantro G1 video encode and decode accelerators present on Rockchip SoCs.
+
+properties:
+  compatible:
+    enum:
+      - rockchip,rk3288-vpu
+      - rockchip,rk3328-vpu
+      - rockchip,rk3399-vpu
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 2
+
+  interrupt-names:
+    items:
+      - const: vepu
+      - const: vdpu
+
+  clocks:
+    maxItems: 2
+
+  clock-names:
+    items:
+      - const: aclk
+      - const: hclk
+
+  power-domains:
+    maxItems: 1
+

Documentation/devicetree/bindings/media/rockchip-vpu.yaml line 54

Quoted 10 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +10 -0
+  iommus:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - interrupt-names
+  - clocks
+  - clock-names

Add:

Quoted 2 lines

additionalProperties: false

OK.

Quoted 9 lines
Quoted 9 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +9 -0
+
+examples:
+  - |
+        #include <dt-bindings/clock/rk3288-cru.h>
+        #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+        vpu: video-codec@ff9a0000 {
+                compatible = "rockchip,rk3288-vpu";
+                reg = <0x0 0xff9a0000 0x0 0x800>;
Quoted 9 lines

Documentation/devicetree/bindings/media/rockchip-vpu.yaml line 69

Quoted 6 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +6 -0
+                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "vepu", "vdpu";
+                clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+                clock-names = "aclk", "hclk";
+                power-domains = <&power RK3288_PD_VIDEO>;

Header for this define?

Indeed, now the check passes. I'll get a v4 just for this patch.

Thanks,
Ezequiel

Quoted 29 lines
Quoted 29 lines
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +13 -0
+                iommus = <&vpu_mmu>;
+        };
+
+        vpu: video-codec@ff350000 {
+                compatible = "rockchip,rk3328-vpu";
+                reg = <0x0 0xff350000 0x0 0x800>;
+                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "vdpu";
+                clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
+                clock-names = "aclk", "hclk";
+                power-domains = <&power RK3328_PD_VPU>;
+                iommus = <&vpu_mmu>;
+        };
MAINTAINERS +1 -2
index d66ac41ef587..2b8b3e7f3df3 100644
@@ -14320,7 +14320,7 @@ L:      [email protected]
 S:     Maintained
 F:     drivers/staging/media/hantro/
 F:     Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
-F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
+F:     Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 
 ROCKER DRIVER
 M:     Jiri Pirko <[email protected]>
--

2.26.0.rc2

#12 lore raw

PATCH v4 1/1 dt-bindings: rockchip-vpu: Convert bindings to json-schema

In reply to Ezequiel Garcia

Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema.

Cc Mark Rutland <[email protected]>
Cc Rob Herring <[email protected]>

---
v4:
* Fix issues pointed out by Rob,
and make sure now dt_binding_check passes.

 .../bindings/media/rockchip-vpu.txt           | 43 -----------
 .../bindings/media/rockchip-vpu.yaml          | 74 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 75 insertions(+), 44 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml
Documentation/devicetree/bindings/media/rockchip-vpu.txt deleted +0 -43
deleted file mode 100644
index 339252d9c515..000000000000
@@ -1,43 +0,0 @@
-device-tree bindings for rockchip VPU codec
-
-Rockchip (Video Processing Unit) present in various Rockchip platforms,
-such as RK3288, RK3328 and RK3399.
-
-Required properties:
-- compatible: value should be one of the following
-		"rockchip,rk3288-vpu";
-		"rockchip,rk3328-vpu";
-		"rockchip,rk3399-vpu";
-- interrupts: encoding and decoding interrupt specifiers
-- interrupt-names: should be
-		"vepu", "vdpu" on RK3288 and RK3399,
-		"vdpu" on RK3328.
-- clocks: phandle to VPU aclk, hclk clocks
-- clock-names: should be "aclk" and "hclk"
-- power-domains: phandle to power domain node
-- iommus: phandle to a iommu node
-
-Example:
-SoC-specific DT entry:
-	vpu: video-codec@ff9a0000 {
-		compatible = "rockchip,rk3288-vpu";
-		reg = <0x0 0xff9a0000 0x0 0x800>;
-		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vepu", "vdpu";
-		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-		clock-names = "aclk", "hclk";
-		power-domains = <&power RK3288_PD_VIDEO>;
-		iommus = <&vpu_mmu>;
-	};
-
-	vpu: video-codec@ff350000 {
-		compatible = "rockchip,rk3328-vpu";
-		reg = <0x0 0xff350000 0x0 0x800>;
-		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vdpu";
-		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-		clock-names = "aclk", "hclk";
-		power-domains = <&power RK3328_PD_VPU>;
-		iommus = <&vpu_mmu>;
-	};
Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +74 -0

74 lines not on this page · raw message

MAINTAINERS +1 -1
index d66ac41ef587..2b8b3e7f3df3 100644
@@ -14320,7 +14320,7 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/staging/media/hantro/
 F:	Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
-F:	Documentation/devicetree/bindings/media/rockchip-vpu.txt
+F:	Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 
 ROCKER DRIVER
 M:	Jiri Pirko <[email protected]>
Signature · 1 line
2.26.0.rc2
maintainer Reviewed-by on v4 1/1
#13 lore raw

Re: [PATCH v4] dt-bindings: rockchip-vpu: Convert bindings to json-schema

Quoted 12 lines · Ezequiel Garcia

Convert Rockchip VPU (Hantro IP block) codec driver documentation to json-schema.

Cc Mark Rutland <[email protected]>
Cc Rob Herring <[email protected]>

---
v4:
* Fix issues pointed out by Rob,
and make sure now dt_binding_check passes.

Quoted 6 lines
 .../bindings/media/rockchip-vpu.txt           | 43 -----------
 .../bindings/media/rockchip-vpu.yaml          | 74 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 75 insertions(+), 44 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.yaml
#14 lore raw

Re: [PATCH v4] dt-bindings: rockchip-vpu: Convert bindings to json-schema

In reply to Ezequiel Garcia

Hi Heiko,

This patch was applied by the media people Hans and Ezequil without note and test I think.

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/media/rockchip-vpu.yaml

Errors for example:

DTC arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml
CHECK arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml
arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml: video-codec@ff350000:
interrupts: [[0, 9, 4]] is too short arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml: video-codec@ff350000:
interrupt-names: ['vdpu'] is too short arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml: video-codec@ff350000:
interrupt-names:0: 'vepu' was expected

See:
https://lore.kernel.org/lkml/[email protected]/

+ interrupts:
+ minItems: 1
+ maxItems: 2
+
+ interrupt-names:
+ oneOf:
+ - const: vdpu
+ - items:
+ - const: vepu
+ - const: vdpu

Vs.:

+ interrupts:
+ maxItems: 2
+
+ interrupt-names:
+ items:
+ - const: vepu
+ - const: vdpu

#15 lore raw

Re: [PATCH v4] dt-bindings: rockchip-vpu: Convert bindings to json-schema

Hey Johan,

Quoted 5 lines · Johan Jonker

Hi Heiko,

This patch was applied by the media people Hans and Ezequil without note and test I think.

I did test it, but I guess something felt thru the cracks. If you'd be kind enough to submit a patch, that would be lovely.

Thanks!
Ezequiel

Quoted 38 lines

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/media/rockchip-vpu.yaml

Errors for example:

DTC arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml
CHECK arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml
arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml: video-codec@ff350000:
interrupts: [[0, 9, 4]] is too short arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml: video-codec@ff350000:
interrupt-names: ['vdpu'] is too short arch/arm64/boot/dts/rockchip/rk3328-evb.dt.yaml: video-codec@ff350000:
interrupt-names:0: 'vepu' was expected

See:
https://lore.kernel.org/lkml/[email protected]/

Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +10 -0
+  interrupts:
+    minItems: 1
+    maxItems: 2
+
+  interrupt-names:
+    oneOf:
+      - const: vdpu
+      - items:
+        - const: vepu
+        - const: vdpu

Vs.:

Documentation/devicetree/bindings/media/rockchip-vpu.yaml new file +7 -0
+  interrupts:
+    maxItems: 2
+
+  interrupt-names:
+    items:
+      - const: vepu
+      - const: vdpu
#16 lore raw

Re: [PATCH v4] dt-bindings: rockchip-vpu: Convert bindings to json-schema

In reply to Johan Jonker

Hi,

Question for the media maintainers Hans & Co. :

What's nxp,imx8mq-vpu.yaml doing under rga?
Why is rockchip-vpu.yaml inserted under rga instead of vpu?

Johan

MAINTAINERS M: Jacob Chen <jacob-chen-fyOeoxGR3m/[email protected]> · line 14476

Quoted 12 lines
MAINTAINERS +2 -1
index f0e7b4d17fcc..0cfd86594b0b 100644
@@ -14471,7 +14471,8 @@ M:	Jacob Chen <jacob-chen-fyOeoxGR3m/[email protected]>
 M:	Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/devicetree/bindings/media/rockchip-rga.txt
+F:	Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
+F:	Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 F:	drivers/media/platform/rockchip/rga/

HANTRO VPU CODEC DRIVER
M: Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
M: Philipp Zabel <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
F: Documentation/devicetree/bindings/media/rockchip-vpu.txt
F: drivers/staging/media/hantro/

ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
M: Jacob Chen <jacob-chen-fyOeoxGR3m/[email protected]>
M: Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml
F: drivers/media/platform/rockchip/rga/

#17 lore raw

Re: [PATCH v4] dt-bindings: rockchip-vpu: Convert bindings to json-schema

Hi,

Also add

L: [email protected]

to all Rockchip related MAINTAINERS items.

Quoted 32 lines · Johan Jonker

Hi,

Question for the media maintainers Hans & Co. :

What's nxp,imx8mq-vpu.yaml doing under rga?
Why is rockchip-vpu.yaml inserted under rga instead of vpu?

Johan

MAINTAINERS M: Jacob Chen <[email protected]> · line 14476

Quoted 12 lines
MAINTAINERS +2 -1
index f0e7b4d17fcc..0cfd86594b0b 100644
@@ -14471,7 +14471,8 @@ M:	Jacob Chen <[email protected]>
 M:	Ezequiel Garcia <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/devicetree/bindings/media/rockchip-rga.txt
+F:	Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
+F:	Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 F:	drivers/media/platform/rockchip/rga/

HANTRO VPU CODEC DRIVER
M: Ezequiel Garcia <[email protected]>
M: Philipp Zabel <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
F: Documentation/devicetree/bindings/media/rockchip-vpu.txt
F: drivers/staging/media/hantro/

Quoted 4 lines

ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
M: Jacob Chen <[email protected]>
M: Ezequiel Garcia <[email protected]>
L: [email protected]

Add list

Quoted 5 lines

S: Maintained
F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml
F: drivers/media/platform/rockchip/rga/

ROCKCHIP VIDEO DECODER DRIVER
M: Ezequiel Garcia <[email protected]>
L: [email protected]

Add list

S: Maintained
F: drivers/staging/media/rkvdec/
F: Documentation/devicetree/bindings/media/rockchip,vdec.yaml

ROCKCHIP ISP V1 DRIVER
M: Helen Koike <[email protected]>
L: [email protected]

Add list

S: Maintained
F: drivers/staging/media/rkisp1/

#18 lore raw

Re: [PATCH v4] dt-bindings: rockchip-vpu: Convert bindings to json-schema

In reply to Johan Jonker
Quoted 6 lines · Johan Jonker

Hi,

Question for the media maintainers Hans & Co. :

What's nxp,imx8mq-vpu.yaml doing under rga?
Why is rockchip-vpu.yaml inserted under rga instead of vpu?

That's clearly wrong. Probably my fault when trying to resolve a conflict.

Ezequiel, can you make a patch fixing this? It's probably a good idea if you double-check these entries to make sure I didn't inadvertently introduce more mistakes.

Regards,

Hans

Quoted 35 lines

Johan

MAINTAINERS M: Jacob Chen <[email protected]> · line 14476

Quoted 12 lines
MAINTAINERS +2 -1
index f0e7b4d17fcc..0cfd86594b0b 100644
@@ -14471,7 +14471,8 @@ M:	Jacob Chen <[email protected]>
 M:	Ezequiel Garcia <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	Documentation/devicetree/bindings/media/rockchip-rga.txt
+F:	Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
+F:	Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 F:	drivers/media/platform/rockchip/rga/

HANTRO VPU CODEC DRIVER
M: Ezequiel Garcia <[email protected]>
M: Philipp Zabel <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
F: Documentation/devicetree/bindings/media/rockchip-vpu.txt
F: drivers/staging/media/hantro/

ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
M: Jacob Chen <[email protected]>
M: Ezequiel Garcia <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml
F: drivers/media/platform/rockchip/rga/

#19 lore raw

Re: [PATCH v4] dt-bindings: rockchip-vpu: Convert bindings to json-schema

Quoted 8 lines · Hans Verkuil
Quoted 6 lines · Johan Jonker

Hi,

Question for the media maintainers Hans & Co. :

What's nxp,imx8mq-vpu.yaml doing under rga?
Why is rockchip-vpu.yaml inserted under rga instead of vpu?

Quoted 7 lines

That's clearly wrong. Probably my fault when trying to resolve a conflict.

Ezequiel, can you make a patch fixing this? It's probably a good idea if you double-check these entries to make sure I didn't inadvertently introduce more mistakes.

Sure, no worries.

Ezequiel