diff options
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/drm/drmP.h | 1 | ||||
| -rw-r--r-- | sys/dev/pci/drm/drm_irq.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h index 9cc5e9017df..9ad87614deb 100644 --- a/sys/dev/pci/drm/drmP.h +++ b/sys/dev/pci/drm/drmP.h @@ -298,7 +298,6 @@ struct drm_local_map { struct drm_vblank_info { struct mutex vb_lock; /* VBLANK data lock */ struct timeout vb_disable_timer; /* timer for disable */ - int vb_disable_allowed; int vb_num; /* number of crtcs */ u_int32_t vb_max; /* counter reg size */ struct drm_vblank { diff --git a/sys/dev/pci/drm/drm_irq.c b/sys/dev/pci/drm/drm_irq.c index 85b07039874..7ba4bf0da4d 100644 --- a/sys/dev/pci/drm/drm_irq.c +++ b/sys/dev/pci/drm/drm_irq.c @@ -159,9 +159,6 @@ vblank_disable(void *arg) int i; mtx_enter(&vbl->vb_lock); - if (!vbl->vb_disable_allowed) - goto out; - for (i = 0; i < vbl->vb_num; i++) { crtc = &vbl->vb_crtcs[i]; @@ -173,7 +170,6 @@ vblank_disable(void *arg) crtc->vbl_enabled = 0; } } -out: mtx_leave(&vbl->vb_lock); } @@ -307,9 +303,6 @@ drm_modeset_ctl(struct drm_device *dev, void *data, struct drm_file *file_priv) case _DRM_POST_MODESET: DPRINTF("%s: post modeset on %d\n", __func__, crtc); if (vbl->vbl_inmodeset) { - mtx_enter(&dev->vblank->vb_lock); - dev->vblank->vb_disable_allowed = 1; - mtx_leave(&dev->vblank->vb_lock); if (vbl->vbl_inmodeset & 0x2) drm_vblank_put(dev, crtc); vbl->vbl_inmodeset = 0; |