Author: rnoland
Date: Tue Jun 23 15:49:02 2009
New Revision: 194721
URL: http://svn.freebsd.org/changeset/base/194721
Log:
Merge 190125 from HEAD
Only issue the wakeup and store the counter if vblank is enabled on
the pipe.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/drm/drm_irq.c
Modified: stable/7/sys/dev/drm/drm_irq.c
==============================================================================
--- stable/7/sys/dev/drm/drm_irq.c Tue Jun 23 15:46:22 2009
(r194720)
+++ stable/7/sys/dev/drm/drm_irq.c Tue Jun 23 15:49:02 2009
(r194721)
@@ -210,10 +210,12 @@ int drm_irq_uninstall(struct drm_device
*/
DRM_SPINLOCK(&dev->vbl_lock);
for (crtc = 0; crtc < dev->num_crtcs; crtc++) {
- DRM_WAKEUP(&dev->vblank[crtc].queue);
- dev->vblank[crtc].enabled = 0;
- dev->vblank[crtc].last =
- dev->driver->get_vblank_counter(dev, crtc);
+ if (dev->vblank[crtc].enabled) {
+ DRM_WAKEUP(&dev->vblank[crtc].queue);
+ dev->vblank[crtc].enabled = 0;
+ dev->vblank[crtc].last =
+ dev->driver->get_vblank_counter(dev, crtc);
+ }
}
DRM_SPINUNLOCK(&dev->vbl_lock);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
