IPU6 driver cleanups and fixes
Subsystems (2)
Sakari Ailus
maintainercover IPU6 driver cleanups and fixes
Hello all,
This small set contains cleanups and fixes for the IPU6 driver. I'm preparing a larger set of improvements in the IPU6 driver on top of the metadata series (I'll post an update soonish) so consider this to be preparation for that.
Sakari Ailus (13):
media: ipu6: Ensure stream_mutex is acquired when dealing with node
list
media: ipu6: Drop MMU hardware initialisation in probe()
media: ipu6: Remove redundant driver data checks
media: ipu6: Make symbols static
media: ipu6: Remove redundant streaming start via buffer queueing
media: ipu6: Don't check pipeline in stream_start
media: ipu6: Close firmware streams on streaming enable failure
media: ipu6: Drop error argument from ipu6_isys_stream_start()
media: ipu6: Obtain remote pad using media_pad_remote_pad_unique()
media: ipu6: Obtain unique source pad from remote sub-device
media: ipu6: Remove source_entity from struct ipu6_isys_stream
media: ipu6: Drop custom functions to obtain sd state information
media: ipu6: Always call video_device_pipeline_alloc_start()
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 2 +- .../media/pci/intel/ipu6/ipu6-isys-queue.c | 61 ++++++++------ .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 36 -------- .../media/pci/intel/ipu6/ipu6-isys-subdev.h | 4 - .../media/pci/intel/ipu6/ipu6-isys-video.c | 82 ++++++------------- .../media/pci/intel/ipu6/ipu6-isys-video.h | 6 +- drivers/media/pci/intel/ipu6/ipu6-isys.c | 17 +--- drivers/media/pci/intel/ipu6/ipu6-isys.h | 2 - 8 files changed, 66 insertions(+), 144 deletions(-)
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 1/13 media: ipu6: Ensure stream_mutex is acquired when dealing with node list
The ipu6 isys driver maintains the list of video buffer queues related to a stream (in ipu6 context streams on the same CSI-2 virtual channel) and this list is modified through VIDIOC_STREAMON and VIDIOC_STREAMOFF IOCTLs. Ensure the common mutex is acquired when accessing the linked list, i.e. the isys device context's stream_mutex.
Add a lockdep assert to ipu6_isys_get_buffer_list() and switch to guard() while at it as the error handling becomes more simple this way.
--- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +5 -3
@@ -3,6 +3,7 @@* Copyright (C) 2013--2024 Intel Corporation */ #include <linux/atomic.h> +#include <linux/cleanup.h> #include <linux/bug.h> #include <linux/device.h> #include <linux/list.h>
@@ -201,6 +202,8 @@ static int buffer_list_get(struct ipu6_isys_stream *stream,unsigned long flags;unsigned long buf_flag =IPU6_ISYS_BUFFER_LIST_FL_INCOMING ; +lockdep_assert_held (&stream->mutex); + bl->nbufs =0 ;INIT_LIST_HEAD (&bl->head);
@@ -294,9 +297,8 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av,struct ipu6_isys_buffer_list __bl;int ret; -mutex_lock (&stream->isys->stream_mutex); +guard (mutex)(&stream->isys->stream_mutex); ret =ipu6_isys_video_set_streaming (av,1 , bl); -mutex_unlock (&stream->isys->stream_mutex);if (ret) goto out_requeue;
@@ -637,10 +639,10 @@ static void stop_streaming(struct vb2_queue *q)mutex_lock (&av->isys->stream_mutex);if (stream->nr_streaming == stream->nr_queues && stream->streaming)ipu6_isys_video_set_streaming (av,0 ,NULL ); +list_del (&aq->node);mutex_unlock (&av->isys->stream_mutex); stream->nr_streaming--; -list_del (&aq->node); stream->streaming =0 ;mutex_unlock (&stream->mutex);
Signature · 1 line
2.47.3
Re: [PATCH 01/13] media: ipu6: Ensure stream_mutex is acquired when dealing with node list
Hi Sakari,
Thank you for the patches!
Quoted 7 lines · Sakari Ailus
The ipu6 isys driver maintains the list of video buffer queues related to a stream (in ipu6 context streams on the same CSI-2 virtual channel) and this list is modified through
VIDIOC_STREAMONandVIDIOC_STREAMOFFIOCTLs. Ensure the common mutex is acquired when accessing the linked list, i.e. the isys device context'sstream_mutex.Add a lockdep assert to
ipu6_isys_get_buffer_list()and switch toguard()
while at it, would you want to switch to guard() for the stream->mutex in the vb2_ops callbacks: start_streaming() and buf_queue(). It will significantly improve the functions. Or maybe in a separate patch ?
--
Kind Regards
Mehdi Djait
Sakari Ailus
maintainerRe: [PATCH 01/13] media: ipu6: Ensure stream_mutex is acquired when dealing with node list
Hi Mehdi,
Quoted 11 lines · Mehdi Djait
Hi Sakari,
Thank you for the patches!
Quoted 6 lines · Sakari Ailus
The ipu6 isys driver maintains the list of video buffer queues related to a stream (in ipu6 context streams on the same CSI-2 virtual channel) and this list is modified through
VIDIOC_STREAMONandVIDIOC_STREAMOFFIOCTLs. Ensure the common mutex is acquired when accessing the linked list, i.e. the isys device context'sstream_mutex.
Quoted 5 lines
Quoted 1 line
Add a lockdep assert to
ipu6_isys_get_buffer_list()and switch toguard()while at it, would you want to switch to
guard()for thestream->mutexin thevb2_opscallbacks:start_streaming()andbuf_queue(). It will significantly improve the functions. Or maybe in a separate patch ?
I have patches on top of the metadata series that make quite a few changes to these functions. I expect to post all probably around mid-January.
Signature · 3 lines
Kind regards, Sakari Ailus
Sakari Ailus
maintainerPATCH 2/13 media: ipu6: Drop MMU hardware initialisation in probe()
In reply to Sakari AilusThe MMU hardware is initialised in the runtime PM resume callback. Do not do it in probe().
--- drivers/media/pci/intel/ipu6/ipu6-isys.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys.c +0 -4
@@ -1070,10 +1070,6 @@ static int isys_probe(struct auxiliary_device *auxdev,if (!isys->csi2)return -ENOMEM ; - ret =ipu6_mmu_hw_init (adev->mmu); -if (ret) -return ret; -/* initial sensor type */ isys->sensor_type = isys->pdata->ipdata->sensor_type_start;
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 3/13 media: ipu6: Remove redundant driver data checks
In reply to Sakari AilusBoth runtime PM resume and suspend callbacks check whether the driver's data is set for the device. This is done in probe(); drop the redundant checks.
--- drivers/media/pci/intel/ipu6/ipu6-isys.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys.c +1 -8
@@ -857,9 +857,6 @@ static int isys_runtime_pm_resume(struct device *dev)unsigned long flags;int ret; -if (!isys) -return 0 ; - ret =ipu6_mmu_hw_init (adev->mmu);if (ret)return ret;
@@ -884,13 +881,9 @@ static int isys_runtime_pm_resume(struct device *dev)static int isys_runtime_pm_suspend (struct device *dev) {struct ipu6_bus_device *adev =to_ipu6_bus_device (dev); -struct ipu6_isys *isys; +struct ipu6_isys *isys =dev_get_drvdata (dev);unsigned long flags; - isys =dev_get_drvdata (dev); -if (!isys) -return 0 ; -spin_lock_irqsave (&isys->power_lock, flags); isys->power =0 ;spin_unlock_irqrestore (&isys->power_lock, flags);
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 4/13 media: ipu6: Make symbols static
In reply to Sakari AilusMake isys_setup_hw and isys_isr static as they're only used in a single file.
--- drivers/media/pci/intel/ipu6/ipu6-isys.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys.c +2 -2
@@ -269,7 +269,7 @@ static int isys_register_video_devices(struct ipu6_isys *isys)return ret; } -void isys_setup_hw (struct ipu6_isys *isys) +static void isys_setup_hw (struct ipu6_isys *isys) {void __iomem *base = isys->pdata->base;const u8 *thd = isys->pdata->ipdata->hw_variant.cdc_fifo_threshold;
@@ -341,7 +341,7 @@ static void ipu6_isys_csi2_isr(struct ipu6_isys_csi2 *csi2) } } -irqreturn_t isys_isr (struct ipu6_bus_device *adev) +static irqreturn_t isys_isr (struct ipu6_bus_device *adev) {struct ipu6_isys *isys =ipu6_bus_get_drvdata (adev);void __iomem *base = isys->pdata->base;
drivers/media/pci/intel/ipu6/ipu6-isys.h +0 -2
@@ -181,8 +181,6 @@ void ipu6_cleanup_fw_msg_bufs(struct ipu6_isys *isys);extern const struct v4l2_ioctl_ops ipu6_isys_ioctl_ops; -void isys_setup_hw (struct ipu6_isys *isys); -irqreturn_t isys_isr (struct ipu6_bus_device *adev);void update_watermark_setting (struct ipu6_isys *isys); int ipu6_isys_mcd_phy_set_power(struct ipu6_isys *isys,
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 5/13 media: ipu6: Remove redundant streaming start via buffer queueing
In reply to Sakari AilusThe videobuf2 framework will ensure buffers are queued before streaming is started. Remove the support for starting streaming based on queued buffers.
--- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +0 -7
@@ -408,13 +408,6 @@ static void buf_queue(struct vb2_buffer *vb)ipu6_isys_buf_to_fw_frame_buf (buf, stream, &bl);ipu6_fw_isys_dump_frame_buff_set (dev, buf, stream->nr_output_pins); -if (!stream->streaming) { - ret =ipu6_isys_stream_start (av, &bl, true); -if (ret) -dev_err (dev,"stream start failed.\n" ); - goto out; - } -/* * We must queue the buffers in the buffer list to the * appropriate video buffer queues BEFORE passing them to the
Signature · 1 line
2.47.3
Re: [PATCH 05/13] media: ipu6: Remove redundant streaming start via buffer queueing
Hi Sakari,
Thank you for the patch!
Quoted 3 lines · Sakari Ailus
The videobuf2 framework will ensure buffers are queued before streaming is started. Remove the support for starting streaming based on queued buffers.
I find the last sentence a bit confusing when looking at the if condition removed.
Maybe something like: Remove the support for stream starting in the buf_queue() callback ?
Quoted 27 lines
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 7 ------- 1 file changed, 7 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +0
-7@@ -408,13 +408,6 @@ static void buf_queue(struct vb2_buffer *vb)ipu6_isys_buf_to_fw_frame_buf (buf, stream, &bl);ipu6_fw_isys_dump_frame_buff_set (dev, buf, stream->nr_output_pins); -if (!stream->streaming) { - ret =ipu6_isys_stream_start (av, &bl, true); -if (ret) -dev_err (dev,"stream start failed.\n" ); - goto out; - } -/* * We must queue the buffers in the buffer list to the * appropriate video buffer queues BEFORE passing them to the Signature · 1 line
2.47.3
--
Kind Regards
Mehdi Djait
Sakari Ailus
maintainerPATCH 6/13 media: ipu6: Don't check pipeline in stream_start
In reply to Sakari AilusA pipeline exists when start_streaming has returned so the check for start_streaming_called is equivalent to having media_pipeline. Use vb2_start_streaming_called() to perform the check.
--- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +2 -4
@@ -355,8 +355,6 @@ static void buf_queue(struct vb2_buffer *vb)vb2_buffer_to_ipu6_isys_video_buffer (vvb);struct ipu6_isys_buffer *ib = &ivb->ib;struct device *dev = &av->isys->adev->auxdev.dev; -struct media_pipeline *media_pipe = -media_entity_pipeline (&av->vdev.entity);struct ipu6_fw_isys_frame_buff_set_abi *buf =NULL ;struct ipu6_isys_stream *stream = av->stream;struct ipu6_isys_buffer_list bl;
@@ -374,8 +372,8 @@ static void buf_queue(struct vb2_buffer *vb)list_add (&ib->head, &aq->incoming);spin_unlock_irqrestore (&aq->lock, flags); -if (!media_pipe || !vb->vb2_queue->start_streaming_called) { -dev_dbg (dev,"media pipeline is not ready for %s\n" , +if (!vb2_start_streaming_called (vb->vb2_queue)) { +dev_dbg (dev,"start_streaming hasn't been called yet on %s\n" , av->vdev.name);return ; }
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 7/13 media: ipu6: Close firmware streams on streaming enable failure
In reply to Sakari AilusWhen enabling streaming fails, the stream is stopped in firmware but not closed. Do this to release resources on firmware side.
--- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1 -0
@@ -1066,6 +1066,7 @@ int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state, out_media_entity_stop_streaming_firmware:stop_streaming_firmware (av); +close_streaming_firmware (av);return ret; }
Signature · 1 line
2.47.3
Re: [PATCH 07/13] media: ipu6: Close firmware streams on streaming enable failure
Hi Sakari,
Thank you for the patch!
Quoted 13 lines · Sakari Ailus
When enabling streaming fails, the stream is stopped in firmware but not closed. Do this to release resources on firmware side.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 1 + 1 file changed, 1 insertion(+)drivers/media/pci/intel/ipu6/ipu6-isys-video.c +0
-0
drivers/media/pci/intel/ipu6/ipu6-isys-video.c int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state, · line 1069
Quoted 4 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1
-0@@ -1066,6 +1066,7 @@ int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state, out_media_entity_stop_streaming_firmware:stop_streaming_firmware (av); +close_streaming_firmware (av);
while at it, the logic of this function is nearly 100% duplicated in the error handling of the start_stream_firmware() function.
--
Kind Regards
Mehdi Djait
Sakari Ailus
maintainerRe: [PATCH 07/13] media: ipu6: Close firmware streams on streaming enable failure
Hi Mehdi,
Quoted 19 lines · Mehdi Djait
Hi Sakari,
Thank you for the patch!
Quoted 14 lines · Sakari Ailus
When enabling streaming fails, the stream is stopped in firmware but not closed. Do this to release resources on firmware side.
Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 1 + 1 file changed, 1 insertion(+)drivers/media/pci/intel/ipu6/ipu6-isys-video.c +0
-0@@ -1066,6 +1066,7 @@ int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state,
Quoted 6 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state, · line 1069
Quoted 3 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1
-0out_media_entity_stop_streaming_firmware:stop_streaming_firmware (av); +close_streaming_firmware (av);while at it, the logic of this function is nearly 100% duplicated in the error handling of the
start_stream_firmware()function.
Yes. I'm reworking this area heavily in the set after the streaming series, I'd prefer to tackle this at that time.
Signature · 3 lines
Kind regards, Sakari Ailus
Sakari Ailus
maintainerPATCH 8/13 media: ipu6: Drop error argument from ipu6_isys_stream_start()
In reply to Sakari Ailuserror argument for ipu6_isys_stream_start() is always false, remove the argument.
--- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +3 -6
@@ -290,7 +290,7 @@ ipu6_isys_buf_to_fw_frame_buf(struct ipu6_fw_isys_frame_buff_set_abi *set,/* Start streaming for real. The buffer list must be available. */ static int ipu6_isys_stream_start (struct ipu6_isys_video *av, -struct ipu6_isys_buffer_list *bl,bool error) +struct ipu6_isys_buffer_list *bl) {struct ipu6_isys_stream *stream = av->stream;struct device *dev = &stream->isys->adev->auxdev.dev;
@@ -336,10 +336,7 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av, out_requeue:if (bl && bl->nbufs)ipu6_isys_buffer_list_queue (bl, -IPU6_ISYS_BUFFER_LIST_FL_INCOMING | - (error ? -IPU6_ISYS_BUFFER_LIST_FL_SET_STATE : -0 ), error ?VB2_BUF_STATE_ERROR : +IPU6_ISYS_BUFFER_LIST_FL_INCOMING ,VB2_BUF_STATE_QUEUED );flush_firmware_streamon_fail (stream);
@@ -590,7 +587,7 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) goto out; } - ret =ipu6_isys_stream_start (av, bl, false); + ret =ipu6_isys_stream_start (av, bl);if (ret) goto out_stream_start;
Signature · 1 line
2.47.3
Re: [PATCH 08/13] media: ipu6: Drop error argument from ipu6_isys_stream_start()
Hi Sakari,
Thank you for the patch!
Quoted 22 lines · Sakari Ailus
error argument for
ipu6_isys_stream_start()is always false, remove the argument.Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +1
-1@@ -290,7 +290,7 @@ ipu6_isys_buf_to_fw_frame_buf(struct ipu6_fw_isys_frame_buff_set_abi *set,/* Start streaming for real. The buffer list must be available. */ static int ipu6_isys_stream_start (struct ipu6_isys_video *av, -struct ipu6_isys_buffer_list *bl,bool error) +struct ipu6_isys_buffer_list *bl) {struct ipu6_isys_stream *stream = av->stream;struct device *dev = &stream->isys->adev->auxdev.dev;
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c static int ipu6_isys_stream_start(struct ipu6_isys_video *av, · line 339
Quoted 8 lines
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +1
-4@@ -336,10 +336,7 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av, out_requeue:if (bl && bl->nbufs) ipu6_isys_buffer_list_queue(bl, - IPU6_ISYS_BUFFER_LIST_FL_INCOMING | - (error ? - IPU6_ISYS_BUFFER_LIST_FL_SET_STATE : - 0), error ? VB2_BUF_STATE_ERROR : + IPU6_ISYS_BUFFER_LIST_FL_INCOMING,
is IPU6_ISYS_BUFFER_LIST_FL_SET_STATE still needed after this patch ?
--
Kind Regards
Mehdi Djait
Sakari Ailus
maintainerRe: [PATCH 08/13] media: ipu6: Drop error argument from ipu6_isys_stream_start()
Hi Mehdi,
Thanks for the review.
Quoted 29 lines · Mehdi Djait
Hi Sakari,
Thank you for the patch!
Quoted 24 lines · Sakari Ailus
error argument for
ipu6_isys_stream_start()is always false, remove the argument.Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +1
-1@@ -290,7 +290,7 @@ ipu6_isys_buf_to_fw_frame_buf(struct ipu6_fw_isys_frame_buff_set_abi *set,/* Start streaming for real. The buffer list must be available. */ static int ipu6_isys_stream_start (struct ipu6_isys_video *av, -struct ipu6_isys_buffer_list *bl,bool error) +struct ipu6_isys_buffer_list *bl) {struct ipu6_isys_stream *stream = av->stream;struct device *dev = &stream->isys->adev->auxdev.dev;@@ -336,10 +336,7 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av, out_requeue:if (bl && bl->nbufs)
Quoted 8 lines
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c static int ipu6_isys_stream_start(struct ipu6_isys_video *av, · line 339
Quoted 6 lines
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +1
-4ipu6_isys_buffer_list_queue(bl, - IPU6_ISYS_BUFFER_LIST_FL_INCOMING | - (error ? - IPU6_ISYS_BUFFER_LIST_FL_SET_STATE : - 0), error ? VB2_BUF_STATE_ERROR : + IPU6_ISYS_BUFFER_LIST_FL_INCOMING,is
IPU6_ISYS_BUFFER_LIST_FL_SET_STATEstill needed after this patch ?
It isn't. I'll remove it as well and post v3 soon.
Signature · 3 lines
Kind regards, Sakari Ailus
Sakari Ailus
maintainerPATCH 9/13 media: ipu6: Obtain remote pad using media_pad_remote_pad_unique()
In reply to Sakari AilusThere's no reason to use media_entity_remote_source_pad_unique() as we know our pads. Use media_pad_remote_pad_unique() instead.
--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +1 -1
@@ -88,7 +88,7 @@ s64 ipu6_isys_csi2_get_link_freq(struct ipu6_isys_csi2 *csi2)if (!csi2)return -EINVAL ; - src_pad =media_entity_remote_source_pad_unique (&csi2->asd.sd.entity); + src_pad =media_pad_remote_pad_unique (&csi2->asd.sd.entity.pads[CSI2_PAD_SINK ]);if (IS_ERR (src_pad)) { dev_err(&csi2->isys->adev->auxdev.dev, "can't get source pad of %s (%pe)\n",
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 10/13 media: ipu6: Obtain unique source pad from remote sub-device
In reply to Sakari AilusObtain unique source pad from a remote sub-device, instead of the first one. This means that only one link may be active at stream start. There's no functional change in practice, unless multiple CSI-2 transmitters are directly connected to the receiver.
--- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +3 -3
@@ -1205,10 +1205,10 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, remote_sd =media_entity_to_v4l2_subdev (remote_pad->entity); asd =to_ipu6_isys_subdev (remote_sd); - source_pad =media_pad_remote_pad_first (&remote_pad->entity->pads[0 ]); -if (!source_pad) { + source_pad =media_pad_remote_pad_unique (&remote_pad->entity->pads[0 ]); +if (IS_ERR (source_pad)) {dev_dbg (dev,"No external source entity\n" ); -return -ENODEV ; +return PTR_ERR (source_pad); } *source_entity = source_pad->entity;
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 11/13 media: ipu6: Remove source_entity from struct ipu6_isys_stream
In reply to Sakari AilusRemove source_entity from struct ipu6_isys_stream and instead pass it on in function arguments.
--- .../media/pci/intel/ipu6/ipu6-isys-queue.c | 22 ++++++++-- .../media/pci/intel/ipu6/ipu6-isys-video.c | 42 +++++-------------- .../media/pci/intel/ipu6/ipu6-isys-video.h | 6 +-- 3 files changed, 31 insertions(+), 39 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +18 -4
@@ -535,14 +535,28 @@ static int start_streaming(struct vb2_queue *q, unsigned int count)ipu6_isys_get_isys_format (ipu6_isys_get_format (av),0 );struct ipu6_isys_buffer_list __bl, *bl =NULL ;struct ipu6_isys_stream *stream; -struct media_entity *source_entity =NULL ; +struct media_pad *source_pad, *remote_pad;int nr_queues, ret;dev_dbg (dev,"stream: %s: width %u, height %u, css pixelformat %u\n" , av->vdev.name,ipu6_isys_get_frame_width (av),ipu6_isys_get_frame_height (av), pfmt->css_pixelformat); - ret =ipu6_isys_setup_video (av, &source_entity, &nr_queues); + remote_pad =media_pad_remote_pad_unique (&av->pad); +if (IS_ERR (remote_pad)) { +dev_dbg (dev,"failed to get remote pad\n" ); + ret =PTR_ERR (remote_pad); + goto out_return_buffers; + } + + source_pad =media_pad_remote_pad_unique (&remote_pad->entity->pads[0 ]); +if (IS_ERR (source_pad)) { +dev_dbg (dev,"No external source entity\n" ); + ret =PTR_ERR (source_pad); + goto out_return_buffers; + } + + ret =ipu6_isys_setup_video (av, remote_pad, source_pad, &nr_queues);if (ret <0 ) {dev_dbg (dev,"failed to setup video\n" ); goto out_return_buffers;
@@ -563,7 +577,7 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) stream = av->stream;mutex_lock (&stream->mutex);if (!stream->nr_streaming) { - ret =ipu6_isys_video_prepare_stream (av, source_entity, + ret =ipu6_isys_video_prepare_stream (av, source_pad->entity, nr_queues);if (ret) goto out_fw_close;
@@ -574,7 +588,7 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) stream->nr_queues);list_add (&aq->node, &stream->queues); -ipu6_isys_configure_stream_watermark (av, true); +ipu6_isys_configure_stream_watermark (av, source_pad->entity);ipu6_isys_update_stream_watermark (av, true);if (stream->nr_streaming != stream->nr_queues)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +10 -32
97 lines not on this page · raw message
drivers/media/pci/intel/ipu6/ipu6-isys-video.h +3 -3
@@ -43,7 +43,6 @@ struct sequence_info {*/ struct ipu6_isys_stream {struct mutex mutex; -struct media_entity *source_entity;atomic_t sequence;unsigned int seq_index;struct sequence_info seq[IPU6_ISYS_MAX_PARALLEL_SOF ];
@@ -113,7 +112,8 @@ int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state,int ipu6_isys_fw_open (struct ipu6_isys *isys);void ipu6_isys_fw_close (struct ipu6_isys *isys);int ipu6_isys_setup_video (struct ipu6_isys_video *av, -struct media_entity **source_entity,int *nr_queues); +struct media_pad *remote_pad, +struct media_pad *source_pad,int *nr_queues);int ipu6_isys_video_init (struct ipu6_isys_video *av);void ipu6_isys_video_cleanup (struct ipu6_isys_video *av);void ipu6_isys_put_stream (struct ipu6_isys_stream *stream);
@@ -123,7 +123,7 @@ struct ipu6_isys_stream * ipu6_isys_query_stream_by_source(struct ipu6_isys *isys, int source, u8 vc);void ipu6_isys_configure_stream_watermark (struct ipu6_isys_video *av, -bool state); +struct media_entity *source);void ipu6_isys_update_stream_watermark (struct ipu6_isys_video *av,bool state);u32 ipu6_isys_get_format (struct ipu6_isys_video *av);
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 12/13 media: ipu6: Drop custom functions to obtain sd state information
In reply to Sakari AilusDrop the custom functions that are used to obtain information from the sub-device state.
--- .../media/pci/intel/ipu6/ipu6-isys-queue.c | 9 +++-- .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 36 ------------------- .../media/pci/intel/ipu6/ipu6-isys-subdev.h | 4 --- .../media/pci/intel/ipu6/ipu6-isys-video.c | 33 +++++++---------- 4 files changed, 19 insertions(+), 63 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +7 -2
@@ -438,8 +438,13 @@ static int ipu6_isys_link_fmt_validate(struct ipu6_isys_queue *aq) sd =media_entity_to_v4l2_subdev (remote_pad->entity); r_stream =ipu6_isys_get_src_stream_by_src_pad (sd, remote_pad->index); - ret =ipu6_isys_get_stream_pad_fmt (sd, remote_pad->index, r_stream, - &format); +struct v4l2_subdev_state *state = +v4l2_subdev_lock_and_get_active_state (sd); + + format = *v4l2_subdev_state_get_format (state, remote_pad->index, + r_stream); + +v4l2_subdev_unlock_state (state);if (ret) { dev_dbg(dev, "failed to get %s: pad %d, stream:%d format\n",
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +0 -36
@@ -265,42 +265,6 @@ static int subdev_set_routing(struct v4l2_subdev *sd,return v4l2_subdev_set_routing_with_fmt (sd, state, routing, &format); } -int ipu6_isys_get_stream_pad_fmt (struct v4l2_subdev *sd,u32 pad,u32 stream, -struct v4l2_mbus_framefmt *format) -{ -struct v4l2_mbus_framefmt *fmt; -struct v4l2_subdev_state *state; - -if (!sd || !format) -return -EINVAL ; - - state =v4l2_subdev_lock_and_get_active_state (sd); - fmt =v4l2_subdev_state_get_format (state, pad, stream); -if (fmt) - *format = *fmt; -v4l2_subdev_unlock_state (state); - -return fmt ?0 : -EINVAL ; -} - -int ipu6_isys_get_stream_pad_crop (struct v4l2_subdev *sd,u32 pad,u32 stream, -struct v4l2_rect *crop) -{ -struct v4l2_subdev_state *state; -struct v4l2_rect *rect; - -if (!sd || !crop) -return -EINVAL ; - - state =v4l2_subdev_lock_and_get_active_state (sd); - rect =v4l2_subdev_state_get_crop (state, pad, stream); -if (rect) - *crop = *rect; -v4l2_subdev_unlock_state (state); - -return rect ?0 : -EINVAL ; -} -u32 ipu6_isys_get_src_stream_by_src_pad (struct v4l2_subdev *sd,u32 pad) {struct v4l2_subdev_state *state;
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h +0 -4
@@ -38,10 +38,6 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd,struct v4l2_subdev_mbus_code_enum *code);u32 ipu6_isys_get_src_stream_by_src_pad (struct v4l2_subdev *sd,u32 pad); -int ipu6_isys_get_stream_pad_fmt (struct v4l2_subdev *sd,u32 pad,u32 stream, -struct v4l2_mbus_framefmt *format); -int ipu6_isys_get_stream_pad_crop (struct v4l2_subdev *sd,u32 pad,u32 stream, -struct v4l2_rect *crop); int ipu6_isys_subdev_set_routing(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, enum v4l2_subdev_format_whence which,
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +12 -21
@@ -455,6 +455,7 @@ static int ipu6_isys_fw_pin_cfg(struct ipu6_isys_video *av, {struct media_pad *src_pad =media_pad_remote_pad_first (&av->pad);struct v4l2_subdev *sd =media_entity_to_v4l2_subdev (src_pad->entity); +struct v4l2_subdev_state *state =v4l2_subdev_get_locked_active_state (sd);struct ipu6_fw_isys_input_pin_info_abi *input_pin;struct ipu6_fw_isys_output_pin_info_abi *output_pin;struct ipu6_isys_stream *stream = av->stream;
@@ -464,26 +465,13 @@ static int ipu6_isys_fw_pin_cfg(struct ipu6_isys_video *av,ipu6_isys_get_isys_format (ipu6_isys_get_format (av),0 );struct v4l2_rect v4l2_crop;struct ipu6_isys *isys = av->isys; -struct device *dev = &isys->adev->auxdev.dev;int input_pins = cfg->nof_input_pins++;int output_pins;u32 src_stream; -int ret; src_stream =ipu6_isys_get_src_stream_by_src_pad (sd, src_pad->index); - ret =ipu6_isys_get_stream_pad_fmt (sd, src_pad->index, src_stream, - &fmt); -if (ret <0 ) { -dev_err (dev,"can't get stream format (%d)\n" , ret); -return ret; - } - - ret =ipu6_isys_get_stream_pad_crop (sd, src_pad->index, src_stream, - &v4l2_crop); -if (ret <0 ) { -dev_err (dev,"can't get stream crop (%d)\n" , ret); -return ret; - } + fmt = *v4l2_subdev_state_get_format (state, src_pad->index, src_stream); + v4l2_crop = *v4l2_subdev_state_get_crop (state, src_pad->index, src_stream); input_pin = &cfg->input_pins[input_pins]; input_pin->input_res.width = fmt.width;
@@ -784,13 +772,16 @@ void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av, csi2 =ipu6_isys_subdev_to_csi2 (av->stream->asd); link_freq =ipu6_isys_csi2_get_link_freq (csi2);if (link_freq >0 ) { +struct v4l2_subdev_state *state = +v4l2_subdev_lock_and_get_active_state (&csi2->asd.sd); + lanes = csi2->nlanes; - ret =ipu6_isys_get_stream_pad_fmt (&csi2->asd.sd,0 , - av->source_stream, &format); -if (!ret) { - bpp =ipu6_isys_mbus_code_to_bpp (format.code); - pixel_rate =mul_u64_u32_div (link_freq, lanes *2 , bpp); - } + format = *v4l2_subdev_state_get_format (state,0 , + av->source_stream); + bpp =ipu6_isys_mbus_code_to_bpp (format.code); + pixel_rate =mul_u64_u32_div (link_freq, lanes *2 , bpp); + +v4l2_subdev_unlock_state (state); } av->watermark.pixel_rate = pixel_rate;
Signature · 1 line
2.47.3
kernel test robot
build botRe: [PATCH 12/13] media: ipu6: Drop custom functions to obtain sd state information
kernel test robot noticed the following build warnings:
Hi Sakari,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linuxtv-media-pending/master]
[also build test WARNING on media-tree/master sailus-media-tree/master linus/master v6.19-rc1 next-20251219] [cannot apply to sailus-media-tree/streams]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Sakari-Ailus/media-ipu6-Ensure-stream_mutex-is-acquired-when-dealing-with-node-list/20251219-180136 base: https://git.linuxtv.org/media-ci/media-pending.git master patch link: https://lore.kernel.org/r/20251219095829.2830843-13-sakari.ailus%40linux.intel.com patch subject: [PATCH 12/13] media: ipu6: Drop custom functions to obtain sd state information config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20251222/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251222/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/media/pci/intel/ipu6/ipu6-isys-queue.c:449:6: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]
449 | if (ret) {
| ^~~
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c:433:9: note: initialize the variable 'ret' to silence this warning
433 | int ret;
| ^
| = 01 warning generated.
vim +/ret +449 drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 423
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 424 static int ipu6_isys_link_fmt_validate(struct ipu6_isys_queue *aq)
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 425 {
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 426 struct v4l2_mbus_framefmt format;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 427 struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 428 struct device *dev = &av->isys->adev->auxdev.dev;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 429 struct media_pad *remote_pad =
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 430 media_pad_remote_pad_first(av->vdev.entity.pads);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 431 struct v4l2_subdev *sd;
d3bd039cd2a0098 Bingbu Cao 2024-01-31 432 u32 r_stream, code;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 433 int ret;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 434
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 435 if (!remote_pad)
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 436 return -ENOTCONN;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 437
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 438 sd = media_entity_to_v4l2_subdev(remote_pad->entity);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 439 r_stream = ipu6_isys_get_src_stream_by_src_pad(sd, remote_pad->index);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 440
627086672dc7e15 Sakari Ailus 2025-12-19 441 struct v4l2_subdev_state *state =
627086672dc7e15 Sakari Ailus 2025-12-19 442 v4l2_subdev_lock_and_get_active_state(sd);
627086672dc7e15 Sakari Ailus 2025-12-19 443
627086672dc7e15 Sakari Ailus 2025-12-19 444 format = *v4l2_subdev_state_get_format(state, remote_pad->index,
627086672dc7e15 Sakari Ailus 2025-12-19 445 r_stream);
627086672dc7e15 Sakari Ailus 2025-12-19 446
627086672dc7e15 Sakari Ailus 2025-12-19 447 v4l2_subdev_unlock_state(state);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 448
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 @449 if (ret) {
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 450 dev_dbg(dev, "failed to get %s: pad %d, stream:%d format\n",
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 451 sd->entity.name, remote_pad->index, r_stream);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 452 return ret;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 453 }
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 454
d3bd039cd2a0098 Bingbu Cao 2024-01-31 455 if (format.width != ipu6_isys_get_frame_width(av) ||
d3bd039cd2a0098 Bingbu Cao 2024-01-31 456 format.height != ipu6_isys_get_frame_height(av)) {
4ff61c4ce93677c Sakari Ailus 2024-05-02 457 dev_dbg(dev, "wrong width or height %ux%u (%ux%u expected)\n",
d3bd039cd2a0098 Bingbu Cao 2024-01-31 458 ipu6_isys_get_frame_width(av),
d3bd039cd2a0098 Bingbu Cao 2024-01-31 459 ipu6_isys_get_frame_height(av), format.width,
d3bd039cd2a0098 Bingbu Cao 2024-01-31 460 format.height);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 461 return -EINVAL;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 462 }
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 463
d3bd039cd2a0098 Bingbu Cao 2024-01-31 464 code = ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0)->code;
d3bd039cd2a0098 Bingbu Cao 2024-01-31 465 if (format.code != code) {
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 466 dev_dbg(dev, "wrong mbus code 0x%8.8x (0x%8.8x expected)\n",
d3bd039cd2a0098 Bingbu Cao 2024-01-31 467 code, format.code);
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 468 return -EINVAL;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 469 }
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 470
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 471 return 0;
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 472 }
3c1dfb5a69cf836 Bingbu Cao 2024-01-31 473 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Sakari Ailus
maintainerPATCH 13/13 media: ipu6: Always call video_device_pipeline_alloc_start()
In reply to Sakari AilusEven if a video device is part of a pipeline already, video_device_pipeline_alloc_start() handles that case gracefully. Don't explicitly differentiate between video_device_pipeline_start() and video_device_pipeline_alloc_start() based on the existence of a pipeline.
--- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1 -5
@@ -1217,11 +1217,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av,return ret; } - pipeline =media_entity_pipeline (&av->vdev.entity); -if (!pipeline) - ret =video_device_pipeline_alloc_start (&av->vdev); -else - ret =video_device_pipeline_start (&av->vdev, pipeline); + ret =video_device_pipeline_alloc_start (&av->vdev);if (ret <0 ) {dev_dbg (dev,"media pipeline start failed\n" );return ret;
Signature · 1 line
2.47.3
kernel test robot
build botRe: [PATCH 13/13] media: ipu6: Always call video_device_pipeline_alloc_start()
kernel test robot noticed the following build warnings:
Hi Sakari,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linuxtv-media-pending/master]
[also build test WARNING on media-tree/master sailus-media-tree/master linus/master v6.19-rc1 next-20251219] [cannot apply to sailus-media-tree/streams]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Sakari-Ailus/media-ipu6-Ensure-stream_mutex-is-acquired-when-dealing-with-node-list/20251219-180136 base: https://git.linuxtv.org/media-ci/media-pending.git master patch link: https://lore.kernel.org/r/20251219095829.2830843-14-sakari.ailus%40linux.intel.com patch subject: [PATCH 13/13] media: ipu6: Always call video_device_pipeline_alloc_start() config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20251222/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251222/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/media/pci/intel/ipu6/ipu6-isys-video.c:1180:25: warning: unused variable 'pipeline' [-Wunused-variable]
1180 | struct media_pipeline *pipeline;
| ^~~~~~~~1 warning generated.
vim +/pipeline +1180 drivers/media/pci/intel/ipu6/ipu6-isys-video.c
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1165
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1166 int ipu6_isys_setup_video(struct ipu6_isys_video *av,
faffdb64f711cf Sakari Ailus 2025-12-19 1167 struct media_pad *remote_pad,
faffdb64f711cf Sakari Ailus 2025-12-19 1168 struct media_pad *source_pad, int *nr_queues)
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1169 {
d3bd039cd2a009 Bingbu Cao 2024-01-31 1170 const struct ipu6_isys_pixelformat *pfmt =
d3bd039cd2a009 Bingbu Cao 2024-01-31 1171 ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1172 struct device *dev = &av->isys->adev->auxdev.dev;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1173 struct v4l2_mbus_frame_desc_entry entry;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1174 struct v4l2_subdev_route *route = NULL;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1175 struct v4l2_subdev_route *r;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1176 struct v4l2_subdev_state *state;
faffdb64f711cf Sakari Ailus 2025-12-19 1177 struct v4l2_subdev *remote_sd =
faffdb64f711cf Sakari Ailus 2025-12-19 1178 media_entity_to_v4l2_subdev(remote_pad->entity);
faffdb64f711cf Sakari Ailus 2025-12-19 1179 struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(remote_sd);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 @1180 struct media_pipeline *pipeline;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1181 int ret = -EINVAL;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1182
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1183 *nr_queues = 0;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1184
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1185 /* Find the root */
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1186 state = v4l2_subdev_lock_and_get_active_state(remote_sd);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1187 for_each_active_route(&state->routing, r) {
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1188 (*nr_queues)++;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1189
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1190 if (r->source_pad == remote_pad->index)
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1191 route = r;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1192 }
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1193
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1194 if (!route) {
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1195 v4l2_subdev_unlock_state(state);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1196 dev_dbg(dev, "Failed to find route\n");
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1197 return -ENODEV;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1198 }
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1199 av->source_stream = route->sink_stream;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1200 v4l2_subdev_unlock_state(state);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1201
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1202 ret = ipu6_isys_csi2_get_remote_desc(av->source_stream,
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1203 to_ipu6_isys_csi2(asd),
faffdb64f711cf Sakari Ailus 2025-12-19 1204 source_pad->entity, &entry);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1205 if (ret == -ENOIOCTLCMD) {
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1206 av->vc = 0;
d3bd039cd2a009 Bingbu Cao 2024-01-31 1207 av->dt = ipu6_isys_mbus_code_to_mipi(pfmt->code);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1208 } else if (!ret) {
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1209 dev_dbg(dev, "Framedesc: stream %u, len %u, vc %u, dt %#x\n",
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1210 entry.stream, entry.length, entry.bus.csi2.vc,
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1211 entry.bus.csi2.dt);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1212
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1213 av->vc = entry.bus.csi2.vc;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1214 av->dt = entry.bus.csi2.dt;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1215 } else {
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1216 dev_err(dev, "failed to get remote frame desc\n");
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1217 return ret;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1218 }
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1219
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1220 ret = video_device_pipeline_alloc_start(&av->vdev);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1221 if (ret < 0) {
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1222 dev_dbg(dev, "media pipeline start failed\n");
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1223 return ret;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1224 }
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1225
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1226 av->stream = ipu6_isys_get_stream(av, asd);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1227 if (!av->stream) {
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1228 video_device_pipeline_stop(&av->vdev);
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1229 dev_err(dev, "no available stream for firmware\n");
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1230 return -EINVAL;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1231 }
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1232
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1233 return 0;
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1234 }
3c1dfb5a69cf83 Bingbu Cao 2024-01-31 1235 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki