xf86-video-ati: Branch 'randr-1.2' - 2 commits

[Dave Airlie]

 src/radeon_dri.c     |    4 ++++
 src/radeon_version.h |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree 8ec617f6493dd0aea5d11f92e3d58c3feef8c8fd (from 73d8e3ec8536b4777490b7ba457566f02233811f)
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 97ed357..1b17e2e 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1679,6 +1679,9 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr
     info->DRICloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = RADEONDRIDoCloseScreen;
 
+    /* disable vblank at startup */
+    RADEONDRISetVBlankInterrupt (pScrn, FALSE);
+
     return TRUE;
 }
 
@@ -1756,6 +1759,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;
diff-tree 73d8e3ec8536b4777490b7ba457566f02233811f (from 63f0d4ed0a98830ecbe18c6e4174689111a59b68)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Jun 3 17:07:59 2007 +1000

    randr-1.2 increase dri minor version for mesa to know we can do vbl on both

diff --git a/src/radeon_version.h b/src/radeon_version.h
index a1b2459..ccc1367 100644
--- a/src/radeon_version.h
+++ b/src/radeon_version.h
@@ -41,7 +41,7 @@
 
 #define RADEON_VERSION_MAJOR 4
 #define RADEON_VERSION_MAJOR_TILED 5
-#define RADEON_VERSION_MINOR 2
+#define RADEON_VERSION_MINOR 3
 #define RADEON_VERSION_PATCH 0
 
 #ifndef RADEON_VERSION_EXTRA