Re: [PATCH v2] davinci: vpif: add pm_runtime support
Hi Hans, On Tue, Apr 2, 2013 at 2:17 PM, Hans Verkuil wrote: > On Mon 1 April 2013 08:36:50 Prabhakar lad wrote: >> From: Lad, Prabhakar >> >> Add pm_runtime support to the TI Davinci VPIF driver. >> >> Signed-off-by: Lad, Prabhakar >> Cc: Mauro Carvalho Chehab >> Cc: Hans Verkuil >> Cc: Laurent Pinchart >> Cc: Sakari Ailus >> Cc: Sekhar Nori >> --- >> Changes for v2: >> 1: Removed use of clk API as pointed by Laurent and Sekhar. >> >> drivers/media/platform/davinci/vpif.c | 24 +++- >> 1 files changed, 7 insertions(+), 17 deletions(-) >> >> diff --git a/drivers/media/platform/davinci/vpif.c >> b/drivers/media/platform/davinci/vpif.c >> index 28638a8..599cabb 100644 >> --- a/drivers/media/platform/davinci/vpif.c >> +++ b/drivers/media/platform/davinci/vpif.c >> @@ -23,8 +23,8 @@ >> #include >> #include >> #include >> -#include >> #include >> +#include >> #include >> >> #include >> @@ -44,7 +44,6 @@ static struct resource *res; >> spinlock_t vpif_lock; >> >> void __iomem *vpif_base; >> -struct clk *vpif_clk; >> >> /** >> * ch_params: video standard configuration parameters for vpif >> @@ -439,19 +438,15 @@ static int vpif_probe(struct platform_device *pdev) >> goto fail; >> } >> >> - vpif_clk = clk_get(&pdev->dev, "vpif"); >> - if (IS_ERR(vpif_clk)) { >> - status = PTR_ERR(vpif_clk); >> - goto clk_fail; >> - } >> - clk_prepare_enable(vpif_clk); >> + pm_runtime_enable(&pdev->dev); >> + pm_runtime_resume(&pdev->dev); >> + >> + pm_runtime_get(&pdev->dev); > > pm_runtime_get() calls pm_runtime_resume() if needed, so is the call to > resume() > really necessary? > Agreed I'll drop the call to pm_runtime_resume() and post a v3. Regards, --Prabhakar > Regards, > > Hans > >> >> spin_lock_init(&vpif_lock); >> dev_info(&pdev->dev, "vpif probe success\n"); >> return 0; >> >> -clk_fail: >> - iounmap(vpif_base); >> fail: >> release_mem_region(res->start, res_len); >> return status; >> @@ -459,11 +454,6 @@ fail: >> >> static int vpif_remove(struct platform_device *pdev) >> { >> - if (vpif_clk) { >> - clk_disable_unprepare(vpif_clk); >> - clk_put(vpif_clk); >> - } >> - >> iounmap(vpif_base); >> release_mem_region(res->start, res_len); >> return 0; >> @@ -472,13 +462,13 @@ static int vpif_remove(struct platform_device *pdev) >> #ifdef CONFIG_PM >> static int vpif_suspend(struct device *dev) >> { >> - clk_disable_unprepare(vpif_clk); >> + pm_runtime_put(dev); >> return 0; >> } >> >> static int vpif_resume(struct device *dev) >> { >> - clk_prepare_enable(vpif_clk); >> + pm_runtime_get(dev); >> return 0; >> } >> >> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] davinci: vpif: add pm_runtime support
On Mon 1 April 2013 08:36:50 Prabhakar lad wrote: > From: Lad, Prabhakar > > Add pm_runtime support to the TI Davinci VPIF driver. > > Signed-off-by: Lad, Prabhakar > Cc: Mauro Carvalho Chehab > Cc: Hans Verkuil > Cc: Laurent Pinchart > Cc: Sakari Ailus > Cc: Sekhar Nori > --- > Changes for v2: > 1: Removed use of clk API as pointed by Laurent and Sekhar. > > drivers/media/platform/davinci/vpif.c | 24 +++- > 1 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/drivers/media/platform/davinci/vpif.c > b/drivers/media/platform/davinci/vpif.c > index 28638a8..599cabb 100644 > --- a/drivers/media/platform/davinci/vpif.c > +++ b/drivers/media/platform/davinci/vpif.c > @@ -23,8 +23,8 @@ > #include > #include > #include > -#include > #include > +#include > #include > > #include > @@ -44,7 +44,6 @@ static struct resource *res; > spinlock_t vpif_lock; > > void __iomem *vpif_base; > -struct clk *vpif_clk; > > /** > * ch_params: video standard configuration parameters for vpif > @@ -439,19 +438,15 @@ static int vpif_probe(struct platform_device *pdev) > goto fail; > } > > - vpif_clk = clk_get(&pdev->dev, "vpif"); > - if (IS_ERR(vpif_clk)) { > - status = PTR_ERR(vpif_clk); > - goto clk_fail; > - } > - clk_prepare_enable(vpif_clk); > + pm_runtime_enable(&pdev->dev); > + pm_runtime_resume(&pdev->dev); > + > + pm_runtime_get(&pdev->dev); pm_runtime_get() calls pm_runtime_resume() if needed, so is the call to resume() really necessary? Regards, Hans > > spin_lock_init(&vpif_lock); > dev_info(&pdev->dev, "vpif probe success\n"); > return 0; > > -clk_fail: > - iounmap(vpif_base); > fail: > release_mem_region(res->start, res_len); > return status; > @@ -459,11 +454,6 @@ fail: > > static int vpif_remove(struct platform_device *pdev) > { > - if (vpif_clk) { > - clk_disable_unprepare(vpif_clk); > - clk_put(vpif_clk); > - } > - > iounmap(vpif_base); > release_mem_region(res->start, res_len); > return 0; > @@ -472,13 +462,13 @@ static int vpif_remove(struct platform_device *pdev) > #ifdef CONFIG_PM > static int vpif_suspend(struct device *dev) > { > - clk_disable_unprepare(vpif_clk); > + pm_runtime_put(dev); > return 0; > } > > static int vpif_resume(struct device *dev) > { > - clk_prepare_enable(vpif_clk); > + pm_runtime_get(dev); > return 0; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] davinci: vpif: add pm_runtime support
On 1 April 2013 13:53, Prabhakar Lad wrote: > On Mon, Apr 1, 2013 at 12:47 PM, Rajagopal Venkat > wrote: >> On 1 April 2013 12:06, Prabhakar lad wrote: >>> From: Lad, Prabhakar >>> >>> Add pm_runtime support to the TI Davinci VPIF driver. >>> >>> Signed-off-by: Lad, Prabhakar >>> Cc: Mauro Carvalho Chehab >>> Cc: Hans Verkuil >>> Cc: Laurent Pinchart >>> Cc: Sakari Ailus >>> Cc: Sekhar Nori >>> --- >>> Changes for v2: >>> 1: Removed use of clk API as pointed by Laurent and Sekhar. >>> >>> drivers/media/platform/davinci/vpif.c | 24 +++- >>> 1 files changed, 7 insertions(+), 17 deletions(-) >>> >>> diff --git a/drivers/media/platform/davinci/vpif.c >>> b/drivers/media/platform/davinci/vpif.c >>> index 28638a8..599cabb 100644 >>> --- a/drivers/media/platform/davinci/vpif.c >>> +++ b/drivers/media/platform/davinci/vpif.c >>> @@ -23,8 +23,8 @@ >>> #include >>> #include >>> #include >>> -#include >>> #include >>> +#include >>> #include >>> >>> #include >>> @@ -44,7 +44,6 @@ static struct resource*res; >>> spinlock_t vpif_lock; >>> >>> void __iomem *vpif_base; >>> -struct clk *vpif_clk; >>> >>> /** >>> * ch_params: video standard configuration parameters for vpif >>> @@ -439,19 +438,15 @@ static int vpif_probe(struct platform_device *pdev) >>> goto fail; >>> } >>> >>> - vpif_clk = clk_get(&pdev->dev, "vpif"); >>> - if (IS_ERR(vpif_clk)) { >>> - status = PTR_ERR(vpif_clk); >>> - goto clk_fail; >>> - } >>> - clk_prepare_enable(vpif_clk); >>> + pm_runtime_enable(&pdev->dev); >>> + pm_runtime_resume(&pdev->dev); >>> + >>> + pm_runtime_get(&pdev->dev); >> >> I don't see runtime-pm ops being registered. Can you explain how clock >> prepare/unprepare is taken care by runtime-pm? >> > The pm_runtime API handles the clock management for you. > For Davinci platform runtime PM support for clock management has > been added (You can find it in arch/arm/mach-davinci/pm_domain.c) > When runtime PM is enabled, the davinci runtime PM implementation will > use the pm_clk layer to enable/disable clocks on demand. I see. Thanks for the explanation. > > For more/detailed understanding you can go through the pm_runtime framework. > > Regards, > --Prabhakar -- Regards, Rajagopal -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] davinci: vpif: add pm_runtime support
On Mon, Apr 1, 2013 at 12:47 PM, Rajagopal Venkat wrote: > On 1 April 2013 12:06, Prabhakar lad wrote: >> From: Lad, Prabhakar >> >> Add pm_runtime support to the TI Davinci VPIF driver. >> >> Signed-off-by: Lad, Prabhakar >> Cc: Mauro Carvalho Chehab >> Cc: Hans Verkuil >> Cc: Laurent Pinchart >> Cc: Sakari Ailus >> Cc: Sekhar Nori >> --- >> Changes for v2: >> 1: Removed use of clk API as pointed by Laurent and Sekhar. >> >> drivers/media/platform/davinci/vpif.c | 24 +++- >> 1 files changed, 7 insertions(+), 17 deletions(-) >> >> diff --git a/drivers/media/platform/davinci/vpif.c >> b/drivers/media/platform/davinci/vpif.c >> index 28638a8..599cabb 100644 >> --- a/drivers/media/platform/davinci/vpif.c >> +++ b/drivers/media/platform/davinci/vpif.c >> @@ -23,8 +23,8 @@ >> #include >> #include >> #include >> -#include >> #include >> +#include >> #include >> >> #include >> @@ -44,7 +44,6 @@ static struct resource*res; >> spinlock_t vpif_lock; >> >> void __iomem *vpif_base; >> -struct clk *vpif_clk; >> >> /** >> * ch_params: video standard configuration parameters for vpif >> @@ -439,19 +438,15 @@ static int vpif_probe(struct platform_device *pdev) >> goto fail; >> } >> >> - vpif_clk = clk_get(&pdev->dev, "vpif"); >> - if (IS_ERR(vpif_clk)) { >> - status = PTR_ERR(vpif_clk); >> - goto clk_fail; >> - } >> - clk_prepare_enable(vpif_clk); >> + pm_runtime_enable(&pdev->dev); >> + pm_runtime_resume(&pdev->dev); >> + >> + pm_runtime_get(&pdev->dev); > > I don't see runtime-pm ops being registered. Can you explain how clock > prepare/unprepare is taken care by runtime-pm? > The pm_runtime API handles the clock management for you. For Davinci platform runtime PM support for clock management has been added (You can find it in arch/arm/mach-davinci/pm_domain.c) When runtime PM is enabled, the davinci runtime PM implementation will use the pm_clk layer to enable/disable clocks on demand. For more/detailed understanding you can go through the pm_runtime framework. Regards, --Prabhakar -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] davinci: vpif: add pm_runtime support
On 1 April 2013 12:06, Prabhakar lad wrote: > From: Lad, Prabhakar > > Add pm_runtime support to the TI Davinci VPIF driver. > > Signed-off-by: Lad, Prabhakar > Cc: Mauro Carvalho Chehab > Cc: Hans Verkuil > Cc: Laurent Pinchart > Cc: Sakari Ailus > Cc: Sekhar Nori > --- > Changes for v2: > 1: Removed use of clk API as pointed by Laurent and Sekhar. > > drivers/media/platform/davinci/vpif.c | 24 +++- > 1 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/drivers/media/platform/davinci/vpif.c > b/drivers/media/platform/davinci/vpif.c > index 28638a8..599cabb 100644 > --- a/drivers/media/platform/davinci/vpif.c > +++ b/drivers/media/platform/davinci/vpif.c > @@ -23,8 +23,8 @@ > #include > #include > #include > -#include > #include > +#include > #include > > #include > @@ -44,7 +44,6 @@ static struct resource*res; > spinlock_t vpif_lock; > > void __iomem *vpif_base; > -struct clk *vpif_clk; > > /** > * ch_params: video standard configuration parameters for vpif > @@ -439,19 +438,15 @@ static int vpif_probe(struct platform_device *pdev) > goto fail; > } > > - vpif_clk = clk_get(&pdev->dev, "vpif"); > - if (IS_ERR(vpif_clk)) { > - status = PTR_ERR(vpif_clk); > - goto clk_fail; > - } > - clk_prepare_enable(vpif_clk); > + pm_runtime_enable(&pdev->dev); > + pm_runtime_resume(&pdev->dev); > + > + pm_runtime_get(&pdev->dev); I don't see runtime-pm ops being registered. Can you explain how clock prepare/unprepare is taken care by runtime-pm? > > spin_lock_init(&vpif_lock); > dev_info(&pdev->dev, "vpif probe success\n"); > return 0; > > -clk_fail: > - iounmap(vpif_base); > fail: > release_mem_region(res->start, res_len); > return status; > @@ -459,11 +454,6 @@ fail: > > static int vpif_remove(struct platform_device *pdev) > { > - if (vpif_clk) { > - clk_disable_unprepare(vpif_clk); > - clk_put(vpif_clk); > - } > - > iounmap(vpif_base); > release_mem_region(res->start, res_len); > return 0; > @@ -472,13 +462,13 @@ static int vpif_remove(struct platform_device *pdev) > #ifdef CONFIG_PM > static int vpif_suspend(struct device *dev) > { > - clk_disable_unprepare(vpif_clk); > + pm_runtime_put(dev); > return 0; > } > > static int vpif_resume(struct device *dev) > { > - clk_prepare_enable(vpif_clk); > + pm_runtime_get(dev); > return 0; > } > > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Regards, Rajagopal -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html