xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_dri.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6ccf5b33d27218ae1c45ab93c122438ed536d8ba
Author: Alex Deucher <alex at botch2.(none)>
Date:   Wed Dec 12 20:12:06 2007 -0500

    RADEON: only enable vblanks if we want them
    
    should fix bug 13610

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 7136e4e..618334e 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1361,6 +1361,9 @@ Bool RADEONDRISetVBlankInterrupt(ScrnInfoPtr pScrn, Bool on)
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
     int value = 0;
 
+    if (!info->want_vblank_interrupts)
+        on = FALSE;
+
     if (info->directRenderingEnabled && info->pKernelDRMVersion->version_minor >= 28) {
         if (on) {
   	    if (xf86_config->num_crtc > 1 && xf86_config->crtc[1]->enabled)