xf86-video-ati: Branch 'master'

[Michel Daenzer]

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

New commits:
commit f9034214f070fe3054cd9cefd7034252de234f38
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Mon Jul 21 09:09:02 2008 +0200

    Call DRM modeset ioctl after the IRQ has been initialized.
    
    This lets the DRM know it can safely disable the vblank interrupts.

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 3218147..a192811 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1211,6 +1211,12 @@ static void RADEONDRIIrqInit(RADEONInfoPtr info, ScreenPtr pScreen)
 	} else {
 	    unsigned char *RADEONMMIO = info->MMIO;
 	    info->ModeReg->gen_int_cntl = INREG( RADEON_GEN_INT_CNTL );
+
+	    /* Let the DRM know it can safely disable the vblank interrupts */
+	    radeon_crtc_modeset_ioctl(XF86_CRTC_CONFIG_PTR(pScrn)->crtc[0],
+				      FALSE);
+	    radeon_crtc_modeset_ioctl(XF86_CRTC_CONFIG_PTR(pScrn)->crtc[0],
+				      TRUE);
 	}
     }