Hi Laurent,
On Mon, Jun 25, 2012 at 18:26:22, Laurent Pinchart wrote:
> Hi Manjunath,
>
> Thank you for the patch.
>
> On Monday 25 June 2012 16:37:31 Manjunath Hadli wrote:
> > Implement power management operations - suspend and resume as part of
> > dev_pm_ops for VPIF display driver.
> >
> > Signed-off-by: Manjunath Hadli <manjunath.hadli@xxxxxx>
> > Signed-off-by: Lad, Prabhakar <prabhakar.lad@xxxxxx>
> > ---
> > drivers/media/video/davinci/vpif_display.c | 75 +++++++++++++++++++++++++
> > 1 files changed, 75 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/media/video/davinci/vpif_display.c
> > b/drivers/media/video/davinci/vpif_display.c index 4436ef6..7408733 100644
> > --- a/drivers/media/video/davinci/vpif_display.c
> > +++ b/drivers/media/video/davinci/vpif_display.c
> > @@ -1807,10 +1807,85 @@ static int vpif_remove(struct platform_device
> > *device) return 0;
> > }
> >
> > +#ifdef CONFIG_PM
> > +static int vpif_suspend(struct device *dev)
> > +{
> > + struct common_obj *common;
> > + struct channel_obj *ch;
> > + int i;
> > +
> > + for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
> > + /* Get the pointer to the channel object */
> > + ch = vpif_obj.dev[i];
> > + common = &ch->common[VPIF_VIDEO_INDEX];
> > + if (mutex_lock_interruptible(&common->lock))
> > + return -ERESTARTSYS;
>
> I might be wrong, but I don't think the suspend/resume handlers react
> correctly to -ERESTARTSYS. If that's correct you should use mutex_lock()
> instead of mutex_lock_interruptible().
>
I'll replace it with mutex_lock().
Thx,
--Manju
> > +
> > + if (atomic_read(&ch->usrs) && common->io_usrs) {
> > + /* Disable channel */
> > + if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {
> > + enable_channel2(0);
> > + channel2_intr_enable(0);
> > + }
> > + if (ch->channel_id == VPIF_CHANNEL3_VIDEO ||
> > + common->started == 2) {
> > + enable_channel3(0);
> > + channel3_intr_enable(0);
> > + }
> > + }
> > + mutex_unlock(&common->lock);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int vpif_resume(struct device *dev)
> > +{
> > +
> > + struct common_obj *common;
> > + struct channel_obj *ch;
> > + int i;
> > +
> > + for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
> > + /* Get the pointer to the channel object */
> > + ch = vpif_obj.dev[i];
> > + common = &ch->common[VPIF_VIDEO_INDEX];
> > + if (mutex_lock_interruptible(&common->lock))
> > + return -ERESTARTSYS;
> > +
> > + if (atomic_read(&ch->usrs) && common->io_usrs) {
> > + /* Enable channel */
> > + if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {
> > + enable_channel2(1);
> > + channel2_intr_enable(1);
> > + }
> > + if (ch->channel_id == VPIF_CHANNEL3_VIDEO ||
> > + common->started == 2) {
> > + enable_channel3(1);
> > + channel3_intr_enable(1);
> > + }
> > + }
> > + mutex_unlock(&common->lock);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static const struct dev_pm_ops vpif_pm = {
> > + .suspend = vpif_suspend,
> > + .resume = vpif_resume,
> > +};
> > +
> > +#define vpif_pm_ops (&vpif_pm)
> > +#else
> > +#define vpif_pm_ops NULL
> > +#endif
> > +
> > static __refdata struct platform_driver vpif_driver = {
> > .driver = {
> > .name = "vpif_display",
> > .owner = THIS_MODULE,
> > + .pm = vpif_pm_ops,
> > },
> > .probe = vpif_probe,
> > .remove = vpif_remove,
> --
> Regards,
>
> Laurent Pinchart
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
