devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Tretter <m.tretter@pengutronix.de>
To: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Michael Tretter <m.tretter@pengutronix.de>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Fabio Estevam <festevam@gmail.com>,
	Alexander Stein <alexander.stein@ew.tq-group.com>,
	kernel@pengutronix.de, linux-imx@nxp.com,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 11/16] media: imx-pxp: Add media controller support
Date: Fri, 13 Jan 2023 10:54:17 +0100	[thread overview]
Message-ID: <20230112-imx-pxp-v2-11-e2281da1db55@pengutronix.de> (raw)
In-Reply-To: <20230112-imx-pxp-v2-0-e2281da1db55@pengutronix.de>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Register a media device for the PXP, using the v4l2-mem2mem MC
infrastructure to populate the media graph. No media device operation is
implemented, the main use of the MC API is to allow consistent discovery
of media devices for userspace.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
Changelog

Changes since v1:

- Drop manual setting of bus_info
- Pick from https://lore.kernel.org/linux-media/20230112172507.30579-1-laurent.pinchart@ideasonboard.com
---
 drivers/media/platform/nxp/imx-pxp.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c
index 86ccc3c4aae3..351e76ee32ca 100644
--- a/drivers/media/platform/nxp/imx-pxp.c
+++ b/drivers/media/platform/nxp/imx-pxp.c
@@ -24,6 +24,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
+#include <media/media-device.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-event.h>
@@ -201,6 +202,9 @@ struct pxp_pdata {
 struct pxp_dev {
 	struct v4l2_device	v4l2_dev;
 	struct video_device	vfd;
+#ifdef CONFIG_MEDIA_CONTROLLER
+	struct media_device	mdev;
+#endif
 
 	struct clk		*clk;
 	void __iomem		*mmio;
@@ -1815,8 +1819,34 @@ static int pxp_probe(struct platform_device *pdev)
 		goto err_m2m;
 	}
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+	dev->mdev.dev = &pdev->dev;
+	strscpy(dev->mdev.model, MEM2MEM_NAME, sizeof(dev->mdev.model));
+	media_device_init(&dev->mdev);
+	dev->v4l2_dev.mdev = &dev->mdev;
+
+	ret = v4l2_m2m_register_media_controller(dev->m2m_dev, vfd,
+						 MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER);
+	if (ret) {
+		dev_err(&pdev->dev, "Failed to initialize media device\n");
+		goto err_vfd;
+	}
+
+	ret = media_device_register(&dev->mdev);
+	if (ret) {
+		dev_err(&pdev->dev, "Failed to register media device\n");
+		goto err_m2m_mc;
+	}
+#endif
+
 	return 0;
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+err_m2m_mc:
+	v4l2_m2m_unregister_media_controller(dev->m2m_dev);
+err_vfd:
+	video_unregister_device(vfd);
+#endif
 err_m2m:
 	v4l2_m2m_release(dev->m2m_dev);
 err_v4l2:
@@ -1837,6 +1867,11 @@ static int pxp_remove(struct platform_device *pdev)
 	clk_disable_unprepare(dev->clk);
 
 	v4l2_info(&dev->v4l2_dev, "Removing " MEM2MEM_NAME);
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+	media_device_unregister(&dev->mdev);
+	v4l2_m2m_unregister_media_controller(dev->m2m_dev);
+#endif
 	video_unregister_device(&dev->vfd);
 	v4l2_m2m_release(dev->m2m_dev);
 	v4l2_device_unregister(&dev->v4l2_dev);

-- 
2.30.2

  parent reply	other threads:[~2023-01-13  9:57 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-13  9:54 [PATCH v2 00/16] media: imx-pxp: add support for i.MX7D Michael Tretter
2023-01-13  9:54 ` [PATCH v2 01/16] dt-bindings: media: fsl-pxp: convert to yaml Michael Tretter
2023-01-13 10:41   ` Laurent Pinchart
2023-01-13 11:46   ` Philipp Zabel
2023-01-13 11:56   ` Krzysztof Kozlowski
2023-01-13 15:09     ` Michael Tretter
2023-01-13 16:51       ` Krzysztof Kozlowski
2023-01-13 15:26   ` Rob Herring
2023-01-16 11:38   ` [PATCH v2.1 02/17] " Michael Tretter
2023-01-16 11:59     ` Krzysztof Kozlowski
2023-01-16 16:11       ` Laurent Pinchart
2023-01-13  9:54 ` [PATCH v2 02/16] media: imx-pxp: detect PXP version Michael Tretter
2023-01-13 10:44   ` Laurent Pinchart
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 03/16] media: imx-pxp: extract helper function to setup data path Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 04/16] media: imx-pxp: explicitly disable unused blocks Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 05/16] media: imx-pxp: disable LUT block Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 06/16] media: imx-pxp: make data_path_ctrl0 platform dependent Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13 12:03   ` Laurent Pinchart
2023-01-13  9:54 ` [PATCH v2 07/16] media: imx-pxp: add support for i.MX7D Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 08/16] ARM: dts: imx7d: add node for PXP Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-16 16:26   ` Laurent Pinchart
2023-01-20  9:06     ` Michael Tretter
2023-01-20  9:20       ` Laurent Pinchart
2023-02-09 14:02         ` Michael Tretter
2023-03-06  1:19           ` Shawn Guo
2023-01-13  9:54 ` [PATCH v2 09/16] media: imx-pxp: Sort headers alphabetically Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 10/16] media: imx-pxp: Don't set bus_info manually in .querycap() Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` Michael Tretter [this message]
2023-01-13 11:46   ` [PATCH v2 11/16] media: imx-pxp: Add media controller support Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 12/16] media: imx-pxp: Pass pixel format value to find_format() Michael Tretter
2023-01-13 11:46   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 13/16] media: imx-pxp: Implement frame size enumeration Michael Tretter
2023-01-13 11:49   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 14/16] media: imx-pxp: Introduce pxp_read() and pxp_write() wrappers Michael Tretter
2023-01-13 11:50   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 15/16] media: imx-pxp: Use non-threaded IRQ Michael Tretter
2023-01-13 11:52   ` Philipp Zabel
2023-01-13  9:54 ` [PATCH v2 16/16] media: imx-pxp: convert to regmap Michael Tretter
2023-01-13 11:56   ` Philipp Zabel
2023-01-14 21:29 ` [PATCH v2 00/16] media: imx-pxp: add support for i.MX7D Laurent Pinchart

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=20230112-imx-pxp-v2-11-e2281da1db55@pengutronix.de \
    --to=m.tretter@pengutronix.de \
    --cc=alexander.stein@ew.tq-group.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=robh+dt@kernel.org \
    /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).