From a7088039752b567ff5119a28aee7dbeadf97228f Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Thu, 25 Jun 2009 14:15:45 +0000 Subject: [PATCH] Ensure that we always hold the lock when calling vblank_disable_fn() MFC after: 3 days --- sys/dev/drm/drm_irq.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/drm/drm_irq.c b/sys/dev/drm/drm_irq.c index eb14bb2f13f2..b98f2ce80d55 100644 --- a/sys/dev/drm/drm_irq.c +++ b/sys/dev/drm/drm_irq.c @@ -70,6 +70,9 @@ static void vblank_disable_fn(void *arg) struct drm_device *dev = (struct drm_device *)arg; int i; + /* Make sure that we are called with the lock held */ + mtx_assert(&dev->vbl_lock, MA_OWNED); + if (callout_pending(&dev->vblank_disable_timer)) { /* callout was reset */ return; @@ -109,7 +112,9 @@ void drm_vblank_cleanup(struct drm_device *dev) callout_drain(&dev->vblank_disable_timer); + DRM_SPINLOCK(&dev->vbl_lock); vblank_disable_fn((void *)dev); + DRM_SPINUNLOCK(&dev->vbl_lock); free(dev->vblank, DRM_MEM_DRIVER);