diff options
| author | Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-12-04 12:42:37 +0100 |
|---|---|---|
| committer | Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-12-11 13:58:35 +0100 |
| commit | eb929dc4d36db7881bbf90d5532b024615f64c0f (patch) | |
| tree | 127b82868b1ca866c3d1c3d913e740caecf999e4 | |
| parent | a51fe84d1d36122bdd7feeebd1d9d85e80ea16e7 (diff) | |
| download | linux-eb929dc4d36db7881bbf90d5532b024615f64c0f.tar.bz2 | |
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 <benjamin.gaignard@linaro.org>
| -rw-r--r-- | drivers/gpu/drm/sti/sti_drm_crtc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c index d42c63f756ef..19e20fcf9f0d 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); |