xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_dri.c |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
diff-tree 2d40fa55e8d7a1cfb204d66ca4a4d95a3b13d5b5 (from dcb64a4d3947e5a9fbda4b72e29a5b6102370f07)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Jun 3 17:32:43 2007 +1000

    radeon: disable irqs at server start until 3D app starts

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 63c35b4..11f7140 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1675,6 +1675,9 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr
     info->DRICloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = RADEONDRIDoCloseScreen;
 
+    /* disable vblank at startup */
+    RADEONDRISetVBlankInterrupt (pScrn, FALSE);
+
     return TRUE;
 }
 
@@ -1752,6 +1755,7 @@ void RADEONDRICloseScreen(ScreenPtr pScr
 		    "RADEONDRICloseScreen\n");
     
      if (info->irq) {
+	RADEONDRISetVBlankInterrupt (pScrn, FALSE);
 	drmCtlUninstHandler(info->drmFD);
 	info->irq = 0;
 	info->ModeReg.gen_int_cntl = 0;