diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-29 09:37:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-01-29 09:37:47 +1000 |
| commit | dee13f12f6ab0c0927adf9168dfc84da93fc9f13 (patch) | |
| tree | 593748d4054a7d623ca04be3b93cd9ae7126f961 /drivers/video | |
| parent | 5a0abe30bebae3e73bf7808f55b2cd0309fa101d (diff) | |
| parent | 3d232346c5656b300028b6c920ddc10b229b5264 (diff) | |
Merge tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
omapdrm patches for 3.14
* tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
drm/omap: Enable DT support for DMM
drm/omap: fix: change dev_unload order
drm/omap: fix: disable encoder before destroying it
drm/omap: fix: disconnect devices when omapdrm module is removed
drm/omap: fix: Defer probe if an omapdss device requests for it at connect
drm/omap: fix (un)registering irqs inside an irq handler
Conflicts:
drivers/gpu/drm/omapdrm/omap_drv.c
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 4ec59ca72e5d..91c687fd002e 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3691,7 +3691,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev) } pm_runtime_enable(&pdev->dev); - pm_runtime_irq_safe(&pdev->dev); r = dispc_runtime_get(); if (r) |