]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drm: sti: remove event lock while disabling vblank
authorBenjamin Gaignard <benjamin.gaignard@linaro.org>
Thu, 4 Dec 2014 11:42:37 +0000 (12:42 +0100)
committerBenjamin Gaignard <benjamin.gaignard@linaro.org>
Thu, 11 Dec 2014 12:58:35 +0000 (13:58 +0100)
Stop use event_lock in vblank disable function.
This was creating a dead lock.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
drivers/gpu/drm/sti/sti_drm_crtc.c

index d42c63f756ef45caeb6859b81f1acfda2a7bc579..19e20fcf9f0df0cd326d9ef999d87ccffa6fb4d0 100644 (file)
@@ -366,7 +366,6 @@ void sti_drm_crtc_disable_vblank(struct drm_device *dev, int crtc)
        struct sti_drm_private *priv = dev->dev_private;
        struct sti_compositor *compo = priv->compo;
        struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb;
-       unsigned long flags;
 
        DRM_DEBUG_DRIVER("\n");
 
@@ -375,13 +374,10 @@ void sti_drm_crtc_disable_vblank(struct drm_device *dev, int crtc)
                DRM_DEBUG_DRIVER("Warning: cannot unregister VTG notifier\n");
 
        /* free the resources of the pending requests */
-       spin_lock_irqsave(&dev->event_lock, flags);
        if (compo->mixer[crtc]->pending_event) {
                drm_vblank_put(dev, crtc);
                compo->mixer[crtc]->pending_event = NULL;
        }
-       spin_unlock_irqrestore(&dev->event_lock, flags);
-
 }
 EXPORT_SYMBOL(sti_drm_crtc_disable_vblank);