diff options
| author | Tomi Valkeinen | 2014-11-14 14:18:28 +0100 |
|---|---|---|
| committer | Tomi Valkeinen | 2015-03-24 12:50:56 +0100 |
| commit | ccd7b5ed7d1ed47ee5ea2f66325972811eb093bd (patch) | |
| tree | 23f62404c19aff8b6cd0b8c4c854c0207d65fff3 /drivers/gpu/drm/omapdrm/omap_drv.c | |
| parent | drm/omap: remove dummy PM functions (diff) | |
| download | kernel-qcow2-linux-ccd7b5ed7d1ed47ee5ea2f66325972811eb093bd.tar.gz kernel-qcow2-linux-ccd7b5ed7d1ed47ee5ea2f66325972811eb093bd.tar.xz kernel-qcow2-linux-ccd7b5ed7d1ed47ee5ea2f66325972811eb093bd.zip | |
drm/omap: stop connector polling during suspend
When not using proper hotplug detection, DRM polls periodically the
connectors to find out if a cable is connected. This polling can happen
at any time, even very late in the suspend process.
This causes a problem with omapdrm, when the poll happens during the
suspend process after GPIOs have been disabled, leading to a crash in
gpio_get().
This patch fixes the issue by adding suspend and resume hooks to
omapdrm, in which we disable and enable, respectively, the polling.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 8d8cf82ecdf7..c4c237317901 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -706,9 +706,28 @@ static int pdev_remove(struct platform_device *device) return 0; } +static int omap_drm_suspend(struct device *dev) +{ + struct drm_device *drm_dev = dev_get_drvdata(dev); + + drm_kms_helper_poll_disable(drm_dev); + + return 0; +} + +static int omap_drm_resume(struct device *dev) +{ + struct drm_device *drm_dev = dev_get_drvdata(dev); + + drm_kms_helper_poll_enable(drm_dev); + + return omap_gem_resume(dev); +} + #ifdef CONFIG_PM static const struct dev_pm_ops omapdrm_pm_ops = { - .resume = omap_gem_resume, + .suspend = omap_drm_suspend, + .resume = omap_drm_resume, }; #endif |