[PATCH 0/2] IPU6 fixes following multi-stream support

[PATCH 0/2] IPU6 fixes following multi-stream support

[Sakari Ailus]

Hi all,

There's a small but important fix for the ipu6 driver's ipu7 support -- on
ipu7 streaming works only once, and apparently this is because the ISYS
needs a power reset between streaming instances. The patch addresses
detecting this, which got broken in the multi-stream support set.

The second patch adds a warning on needing a reset.

Addressing why the reset is needed is out of scope of this set.

Sakari Ailus (2):
  media: ipu6: Reset need_reset in ISYS suspend
  media: ipu6: Warn if the active list isn't empty when returning
    buffers

 drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 7 +++++++
 drivers/media/pci/intel/ipu6/ipu6-isys.c       | 4 ++++
 2 files changed, 11 insertions(+)


base-commit: 58348f64125e9a3e44d3abb275ca7f4e6c9641e5
-- 
2.47.3

[PATCH 1/2] media: ipu6: Reset need_reset in ISYS suspend

[Sakari Ailus]

The need_reset field in struct ipu6_isys tells whether the device needs a
power-on reset. Resetting the field was removed unintentionally in commit
70e3fac3ec78 ("media: ipu6: Move firmware init/cleanup to RPM callbacks").

Add it back.

Fixes: 70e3fac3ec78 ("media: ipu6: Move firmware init/cleanup to RPM callbacks")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/pci/intel/ipu6/ipu6-isys.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 60f5f9ea2910..74bb48c1f814 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -826,6 +826,10 @@ static int isys_runtime_pm_suspend(struct device *dev)
 		ret = -EIO;
 	}
 
+	mutex_lock(&isys->mutex);
+	isys->need_reset = false;
+	mutex_unlock(&isys->mutex);
+
 	isys->phy_termcal_val = 0;
 	cpu_latency_qos_update_request(&isys->pm_qos, PM_QOS_DEFAULT_VALUE);
 
-- 
2.47.3

[PATCH 2/2] media: ipu6: Warn if the active list isn't empty when returning buffers

[Sakari Ailus]

The ISYS needs a reset when the active buffer list isn't empty. Warn about
this.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
index 2608e3b91acb..c9ecda158fd1 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
@@ -423,6 +423,7 @@ static void return_buffers(struct ipu6_isys_queue *aq,
 	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
 	struct ipu6_isys_buffer *ib;
 	bool need_reset = false;
+	bool first_buf = true;
 	unsigned long flags;
 
 	spin_lock_irqsave(&aq->lock, flags);
@@ -448,6 +449,12 @@ static void return_buffers(struct ipu6_isys_queue *aq,
 	while (!list_empty(&aq->active)) {
 		struct vb2_buffer *vb;
 
+		if (first_buf) {
+			dev_warn(&av->isys->adev->auxdev.dev,
+				 "buffer list not empty, needs isys reset\n");
+			first_buf = false;
+		}
+
 		ib = list_first_entry(&aq->active, struct ipu6_isys_buffer,
 				      head);
 		vb = ipu6_isys_buffer_to_vb2_buffer(ib);
-- 
2.47.3

Re: [PATCH 2/2] media: ipu6: Warn if the active list isn't empty when returning buffers

[Antti Laakso]

On Tue, Sep 29, 2026 at 01:54:15PM +0300, Sakari Ailus wrote:
> The ISYS needs a reset when the active buffer list isn't empty. Warn about
> this.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
> index 2608e3b91acb..c9ecda158fd1 100644
> --- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
> +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
> @@ -423,6 +423,7 @@ static void return_buffers(struct ipu6_isys_queue *aq,
>  	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
>  	struct ipu6_isys_buffer *ib;
>  	bool need_reset = false;
> +	bool first_buf = true;
>  	unsigned long flags;
>  
>  	spin_lock_irqsave(&aq->lock, flags);
> @@ -448,6 +449,12 @@ static void return_buffers(struct ipu6_isys_queue *aq,
>  	while (!list_empty(&aq->active)) {
>  		struct vb2_buffer *vb;
>  
> +		if (first_buf) {
> +			dev_warn(&av->isys->adev->auxdev.dev,
> +				 "buffer list not empty, needs isys reset\n");
> +			first_buf = false;
> +		}

Could the warning be in the end of the function, in need_reset block. We
could save one local variable too.

> +
>  		ib = list_first_entry(&aq->active, struct ipu6_isys_buffer,
>  				      head);
>  		vb = ipu6_isys_buffer_to_vb2_buffer(ib);
> -- 
> 2.47.3
> 

Re: [PATCH 2/2] media: ipu6: Warn if the active list isn't empty when returning buffers

[Sakari Ailus]

Hei Antti,

Thanks for the review.

On Wed, Sep 30, 2026 at 12:23:52PM +0300, Antti Laakso wrote:
> On Tue, Sep 29, 2026 at 01:54:15PM +0300, Sakari Ailus wrote:
> > The ISYS needs a reset when the active buffer list isn't empty. Warn about
> > this.
> > 
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> >  drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
> > index 2608e3b91acb..c9ecda158fd1 100644
> > --- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
> > +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
> > @@ -423,6 +423,7 @@ static void return_buffers(struct ipu6_isys_queue *aq,
> >  	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
> >  	struct ipu6_isys_buffer *ib;
> >  	bool need_reset = false;
> > +	bool first_buf = true;
> >  	unsigned long flags;
> >  
> >  	spin_lock_irqsave(&aq->lock, flags);
> > @@ -448,6 +449,12 @@ static void return_buffers(struct ipu6_isys_queue *aq,
> >  	while (!list_empty(&aq->active)) {
> >  		struct vb2_buffer *vb;
> >  
> > +		if (first_buf) {
> > +			dev_warn(&av->isys->adev->auxdev.dev,
> > +				 "buffer list not empty, needs isys reset\n");
> > +			first_buf = false;
> > +		}
> 
> Could the warning be in the end of the function, in need_reset block. We
> could save one local variable too.

Makes sense; I'll do that for v2.

-- 
Terveisin,

Sakari Ailus