d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that we always hold the lock when calling vblank_disable_fn()

Browse Source 
MFC after:	3 days
This commit is contained in:
Robert Noland 2009-06-25 14:15:45 +00:00
parent ca99828420
commit a708803975
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/drm/drm_irq.c
View File

@ -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);