mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-17 22:04:40 +00:00
Ensure that we always hold the lock when calling vblank_disable_fn()
MFC after: 3 days
This commit is contained in:
parent
ca99828420
commit
a708803975
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=194960
|
@ -70,6 +70,9 @@ static void vblank_disable_fn(void *arg)
|
||||||
struct drm_device *dev = (struct drm_device *)arg;
|
struct drm_device *dev = (struct drm_device *)arg;
|
||||||
int i;
|
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)) {
|
if (callout_pending(&dev->vblank_disable_timer)) {
|
||||||
/* callout was reset */
|
/* callout was reset */
|
||||||
return;
|
return;
|
||||||
|
@ -109,7 +112,9 @@ void drm_vblank_cleanup(struct drm_device *dev)
|
||||||
|
|
||||||
callout_drain(&dev->vblank_disable_timer);
|
callout_drain(&dev->vblank_disable_timer);
|
||||||
|
|
||||||
|
DRM_SPINLOCK(&dev->vbl_lock);
|
||||||
vblank_disable_fn((void *)dev);
|
vblank_disable_fn((void *)dev);
|
||||||
|
DRM_SPINUNLOCK(&dev->vbl_lock);
|
||||||
|
|
||||||
free(dev->vblank, DRM_MEM_DRIVER);
|
free(dev->vblank, DRM_MEM_DRIVER);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue