[PATCH] media: renesas: vsp1: Move suspend/resume handling to LATE phase

[PATCH] media: renesas: vsp1: Move suspend/resume handling to LATE phase

[Tommaso Merciai]

Switch the VSP1 driver's dev_pm_ops to LATE_SYSTEM_SLEEP_PM_OPS to ensure
that suspend and resume callbacks are executed after DSI/DU suspend and
before DSI/DU resume. This prevents timeouts and vblank wait errors during
system resume, such as:

[drm] *ERROR* flip_done timed out [CRTC:43:crtc-0] vblank wait timed out

This addresses display commit and vblank timeouts seen with DRM atomic
helpers during s2ram.

Co-developed-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
---
 drivers/media/platform/renesas/vsp1/vsp1_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
index 2de515c497eb..0fbd27df1f46 100644
--- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
@@ -693,7 +693,7 @@ static int vsp1_pm_runtime_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops vsp1_pm_ops = {
-	SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
+	LATE_SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
 	RUNTIME_PM_OPS(vsp1_pm_runtime_suspend, vsp1_pm_runtime_resume, NULL)
 };
 
-- 
2.43.0

Re: [PATCH] media: renesas: vsp1: Move suspend/resume handling to LATE phase

[Tommaso Merciai]

Hi All,

Gentle ping on this patch.

Kind Regards,
Tommaso

On Fri, Dec 12, 2025 at 01:11:50PM +0100, Tommaso Merciai wrote:
> Switch the VSP1 driver's dev_pm_ops to LATE_SYSTEM_SLEEP_PM_OPS to ensure
> that suspend and resume callbacks are executed after DSI/DU suspend and
> before DSI/DU resume. This prevents timeouts and vblank wait errors during
> system resume, such as:
> 
> [drm] *ERROR* flip_done timed out [CRTC:43:crtc-0] vblank wait timed out
> 
> This addresses display commit and vblank timeouts seen with DRM atomic
> helpers during s2ram.
> 
> Co-developed-by: Biju Das <biju.das.jz@bp.renesas.com>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
> ---
>  drivers/media/platform/renesas/vsp1/vsp1_drv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> index 2de515c497eb..0fbd27df1f46 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> @@ -693,7 +693,7 @@ static int vsp1_pm_runtime_resume(struct device *dev)
>  }
>  
>  static const struct dev_pm_ops vsp1_pm_ops = {
> -	SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
> +	LATE_SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
>  	RUNTIME_PM_OPS(vsp1_pm_runtime_suspend, vsp1_pm_runtime_resume, NULL)
>  };
>  
> -- 
> 2.43.0
> 

Re: [PATCH] media: renesas: vsp1: Move suspend/resume handling to LATE phase

[Laurent Pinchart]

Hi Tommaso,

Thank you for the patch.

On Fri, Dec 12, 2025 at 01:11:50PM +0100, Tommaso Merciai wrote:
> Switch the VSP1 driver's dev_pm_ops to LATE_SYSTEM_SLEEP_PM_OPS to ensure
> that suspend and resume callbacks are executed after DSI/DU suspend and
> before DSI/DU resume.

Have you considered handling this through device links ? Using late
system sleep is a hack that doesn't scale when more than two devices are
involved.

I've just written and posted [1] to address the issue in the rcar-du
driver (the suspend/resume ordering was right, but apparently only by
chance), it should be easy to replicate it in the rz-du driver..

[1] https://lore.kernel.org/dri-devel/20260317231930.595719-2-laurent.pinchart+renesas@ideasonboard.com/T/#u

> This prevents timeouts and vblank wait errors during
> system resume, such as:
> 
> [drm] *ERROR* flip_done timed out [CRTC:43:crtc-0] vblank wait timed out
> 
> This addresses display commit and vblank timeouts seen with DRM atomic
> helpers during s2ram.
> 
> Co-developed-by: Biju Das <biju.das.jz@bp.renesas.com>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
> ---
>  drivers/media/platform/renesas/vsp1/vsp1_drv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> index 2de515c497eb..0fbd27df1f46 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> @@ -693,7 +693,7 @@ static int vsp1_pm_runtime_resume(struct device *dev)
>  }
>  
>  static const struct dev_pm_ops vsp1_pm_ops = {
> -	SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
> +	LATE_SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
>  	RUNTIME_PM_OPS(vsp1_pm_runtime_suspend, vsp1_pm_runtime_resume, NULL)
>  };
>  

-- 
Regards,

Laurent Pinchart

Re: [PATCH] media: renesas: vsp1: Move suspend/resume handling to LATE phase

[Tommaso Merciai]

Hi Laurent,
Thanks for your review.

On 3/18/26 00:23, Laurent Pinchart wrote:
> Hi Tommaso,
> 
> Thank you for the patch.
> 
> On Fri, Dec 12, 2025 at 01:11:50PM +0100, Tommaso Merciai wrote:
>> Switch the VSP1 driver's dev_pm_ops to LATE_SYSTEM_SLEEP_PM_OPS to ensure
>> that suspend and resume callbacks are executed after DSI/DU suspend and
>> before DSI/DU resume.
> 
> Have you considered handling this through device links ? Using late
> system sleep is a hack that doesn't scale when more than two devices are
> involved.
> 
> I've just written and posted [1] to address the issue in the rcar-du
> driver (the suspend/resume ordering was right, but apparently only by
> chance), it should be easy to replicate it in the rz-du driver..
> 
> [1] https://lore.kernel.org/dri-devel/20260317231930.595719-2-laurent.pinchart+renesas@ideasonboard.com/T/#u
> 
>> This prevents timeouts and vblank wait errors during
>> system resume, such as:
>>
>> [drm] *ERROR* flip_done timed out [CRTC:43:crtc-0] vblank wait timed out
>>
>> This addresses display commit and vblank timeouts seen with DRM atomic
>> helpers during s2ram.

Thanks for sharing I've replicated [0] on rzg2l_du_vsp driver.
I've tested that on RZ/G3E, s2ram and s2idle works fine.

[0] 
https://patchwork.kernel.org/project/linux-renesas-soc/patch/20260317231930.595719-2-laurent.pinchart+renesas@ideasonboard.com/

I'll provide feedback on the series.
Thanks for your work! :)

Kind Regards,
Tommaso

>>
>> Co-developed-by: Biju Das <biju.das.jz@bp.renesas.com>
>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>> Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
>> ---
>>   drivers/media/platform/renesas/vsp1/vsp1_drv.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
>> index 2de515c497eb..0fbd27df1f46 100644
>> --- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
>> +++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
>> @@ -693,7 +693,7 @@ static int vsp1_pm_runtime_resume(struct device *dev)
>>   }
>>   
>>   static const struct dev_pm_ops vsp1_pm_ops = {
>> -	SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
>> +	LATE_SYSTEM_SLEEP_PM_OPS(vsp1_pm_suspend, vsp1_pm_resume)
>>   	RUNTIME_PM_OPS(vsp1_pm_runtime_suspend, vsp1_pm_runtime_resume, NULL)
>>   };
>>   
>