drm/omap: fix (un)registering irqs inside an irq handler

omapdrm (un)registers irqs inside an irq handler. The problem is that
the (un)register function uses dispc_runtime_get/put() to enable the
clocks, and those functions are not irq safe by default.

This was kind of fixed in 48664b21aeeffb40c5fa06843f18052e2c4ec9ef
(OMAPDSS: DISPC: set irq_safe for runtime PM), which makes dispc's
runtime calls irq-safe.

However, using pm_runtime_irq_safe in dispc makes the parent of dispc,
dss, always enabled, effectively preventing PM for the whole DSS module.

This patch makes omapdrm behave better by adding new irq (un)register
functions that do not use dispc_runtime_get/put, and using those
functions in interrupt context. Thus we can make dispc again
non-irq-safe, allowing proper PM.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Rob Clark <robdclark@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 0fd2eb139f6e..e6241c2b8b26 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);
         }
 }