Hi Paul, On Tue, Nov 29, 2022 at 09:05:49PM +0000, Paul Cercueil wrote: > Le mardi 29 novembre 2022 à 21:43 +0200, Laurent Pinchart a écrit : > > On Tue, Nov 29, 2022 at 07:19:33PM +0000, Paul Cercueil wrote: > > > Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle > > > the .suspend/.resume callbacks. > > > > > > These macros allow the suspend and resume functions to be automatically > > > dropped by the compiler when CONFIG_SUSPEND is disabled, without having > > > to use #ifdef guards. > > > > > > This has the advantage of always compiling these functions in, > > > independently of any Kconfig option. Thanks to that, bugs and other > > > regressions are subsequently easier to catch. > > > > > > Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx> > > > Reviewed-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> > > > > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> > > > > Will you get this whole series merged in one go in drm-misc, or do you > > expect me to take this patch in my tree ? I'd prefer the first option if > > possible (less work for me :-)). > > I actually answered that in my cover letter ;) Oops. I read until "V2" and didn't notice the last paragraph, sorry. > However I assumed it had to go through drm-next, if you think it can go > through drm-misc-next, I can apply it myself. This seems like a good candidate for drm-misc to me. > > > --- > > > Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > > Cc: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> > > > Cc: linux-renesas-soc@xxxxxxxxxxxxxxx > > > --- > > > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +++------ > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > > b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > > index d003e8d9e7a2..eeec1e02446f 100644 > > > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > > > @@ -599,7 +599,6 @@ static const struct drm_driver rcar_du_driver = > > > { > > > * Power management > > > */ > > > > > > -#ifdef CONFIG_PM_SLEEP > > > static int rcar_du_pm_suspend(struct device *dev) > > > { > > > struct rcar_du_device *rcdu = dev_get_drvdata(dev); > > > @@ -613,11 +612,9 @@ static int rcar_du_pm_resume(struct device > > > *dev) > > > > > > return drm_mode_config_helper_resume(&rcdu->ddev); > > > } > > > -#endif > > > > > > -static const struct dev_pm_ops rcar_du_pm_ops = { > > > - SET_SYSTEM_SLEEP_PM_OPS(rcar_du_pm_suspend, > > > rcar_du_pm_resume) > > > -}; > > > +static DEFINE_SIMPLE_DEV_PM_OPS(rcar_du_pm_ops, > > > + rcar_du_pm_suspend, > > > rcar_du_pm_resume); > > > > > > /* --------------------------------------------------------------- > > > -------------- > > > * Platform driver > > > @@ -712,7 +709,7 @@ static struct platform_driver > > > rcar_du_platform_driver = { > > > .shutdown = rcar_du_shutdown, > > > .driver = { > > > .name = "rcar-du", > > > - .pm = &rcar_du_pm_ops, > > > + .pm = pm_sleep_ptr(&rcar_du_pm_ops), > > > .of_match_table = rcar_du_of_table, > > > }, > > > }; -- Regards, Laurent Pinchart