drm/omap: add hibernation callbacks
Setting a dev_pm_ops suspend/resume pair but not a set of hibernation functions means those pm functions will not be called upon hibernation. Fix this by using SIMPLE_DEV_PM_OPS, which appropriately assigns the suspend and hibernation handlers and move omap_drm_suspend/omap_drm_resume under CONFIG_PM_SLEEP to avoid build warnings. Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org> [tomi.valkeinen@ti.com: fix conflict, clean up description] Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
223bfd6911
commit
8450c8d071
|
@ -707,6 +707,7 @@ static int pdev_remove(struct platform_device *device)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM_SLEEP
|
||||||
static int omap_drm_suspend(struct device *dev)
|
static int omap_drm_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
struct drm_device *drm_dev = dev_get_drvdata(dev);
|
struct drm_device *drm_dev = dev_get_drvdata(dev);
|
||||||
|
@ -724,20 +725,14 @@ static int omap_drm_resume(struct device *dev)
|
||||||
|
|
||||||
return omap_gem_resume(dev);
|
return omap_gem_resume(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
|
||||||
static const struct dev_pm_ops omapdrm_pm_ops = {
|
|
||||||
.suspend = omap_drm_suspend,
|
|
||||||
.resume = omap_drm_resume,
|
|
||||||
};
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static SIMPLE_DEV_PM_OPS(omapdrm_pm_ops, omap_drm_suspend, omap_drm_resume);
|
||||||
|
|
||||||
static struct platform_driver pdev = {
|
static struct platform_driver pdev = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = DRIVER_NAME,
|
.name = DRIVER_NAME,
|
||||||
#ifdef CONFIG_PM
|
|
||||||
.pm = &omapdrm_pm_ops,
|
.pm = &omapdrm_pm_ops,
|
||||||
#endif
|
|
||||||
},
|
},
|
||||||
.probe = pdev_probe,
|
.probe = pdev_probe,
|
||||||
.remove = pdev_remove,
|
.remove = pdev_remove,
|
||||||
|
|
Loading…
Reference in a new issue