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

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 0fd2eb139f6e..4313bb0a49a6 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -411,7 +411,7 @@ static void omap_crtc_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
         struct drm_crtc *crtc = &omap_crtc->base;
         DRM_ERROR("%s: errors: %08x\n", omap_crtc->name, irqstatus);
         /* avoid getting in a flood, unregister the irq until next vblank */
-        omap_irq_unregister(crtc->dev, &omap_crtc->error_irq);
+        __omap_irq_unregister(crtc->dev, &omap_crtc->error_irq);
 }
 
 static void omap_crtc_apply_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
@@ -421,13 +421,13 @@ static void omap_crtc_apply_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
         struct drm_crtc *crtc = &omap_crtc->base;
 
         if (!omap_crtc->error_irq.registered)
-                omap_irq_register(crtc->dev, &omap_crtc->error_irq);
+                __omap_irq_register(crtc->dev, &omap_crtc->error_irq);
 
         if (!dispc_mgr_go_busy(omap_crtc->channel)) {
                 struct omap_drm_private *priv =
                                 crtc->dev->dev_private;
                 DBG("%s: apply done", omap_crtc->name);
-                omap_irq_unregister(crtc->dev, &omap_crtc->apply_irq);
+                __omap_irq_unregister(crtc->dev, &omap_crtc->apply_irq);
                 queue_work(priv->wq, &omap_crtc->apply_work);
         }
 }
@@ -623,6 +623,11 @@ void omap_crtc_pre_init(void)
         dss_install_mgr_ops(&mgr_ops);
 }
 
+void omap_crtc_pre_uninit(void)
+{
+        dss_uninstall_mgr_ops();
+}
+
 /* initialize crtc */
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 struct drm_plane *plane, enum omap_channel channel, int id)