From: Benjamin Gaignard Date: Thu, 4 Dec 2014 11:42:37 +0000 (+0100) Subject: drm: sti: remove event lock while disabling vblank X-Git-Tag: v4.14-rc1~6290^2~1^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb929dc4d36db7881bbf90d5532b024615f64c0f;p=platform%2Fkernel%2Flinux-rpi.git drm: sti: remove event lock while disabling vblank Stop use event_lock in vblank disable function. This was creating a dead lock. Signed-off-by: Benjamin Gaignard --- diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c index d42c63f..19e20fc 100644 --- a/drivers/gpu/drm/sti/sti_drm_crtc.c +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c @@ -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);