]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: nxp: imx8-isi: Mark all crossbar sink pads as MUST_CONNECT
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 15 Jan 2024 02:16:29 +0000 (04:16 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:11:08 +0000 (15:11 +0200)
[ Upstream commit 9b71021b2ea537632b01e51e3f003df24a637858 ]

All the sink pads of the crossbar switch require an active link if
they're part of the pipeline. Mark them with the
MEDIA_PAD_FL_MUST_CONNECT flag to fail pipeline validation if they're
not connected. This allows removing a manual check when translating
streams.

Cc: stable@vger.kernel.org # 6.1
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c

index 44354931cf8a1cb6f796ec878d8146dd725a1ecd..c9a4d091b5707402bacc5f53261e61434758f9f5 100644 (file)
@@ -160,13 +160,6 @@ mxc_isi_crossbar_xlate_streams(struct mxc_isi_crossbar *xbar,
        }
 
        pad = media_pad_remote_pad_first(&xbar->pads[sink_pad]);
-       if (!pad) {
-               dev_dbg(xbar->isi->dev,
-                       "no pad connected to crossbar input %u\n",
-                       sink_pad);
-               return ERR_PTR(-EPIPE);
-       }
-
        sd = media_entity_to_v4l2_subdev(pad->entity);
        if (!sd) {
                dev_dbg(xbar->isi->dev,
@@ -471,7 +464,8 @@ int mxc_isi_crossbar_init(struct mxc_isi_dev *isi)
        }
 
        for (i = 0; i < xbar->num_sinks; ++i)
-               xbar->pads[i].flags = MEDIA_PAD_FL_SINK;
+               xbar->pads[i].flags = MEDIA_PAD_FL_SINK
+                                   | MEDIA_PAD_FL_MUST_CONNECT;
        for (i = 0; i < xbar->num_sources; ++i)
                xbar->pads[i + xbar->num_sinks].flags = MEDIA_PAD_FL_SOURCE;