xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_kms.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 426114b4a99d37b394efe3336968bb0ab9b6e9ae
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jun 8 11:34:35 2010 +1000

    xv: fix Xv on M6/RV100 under KMS.
    
    pRADEONEnt->HasCRTC2 wasn't setup under KMS.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index c6a3df7..3c832ca 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -512,6 +512,10 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	goto fail;
     }
 
+    if (info->drmmode.mode_res->count_crtcs == 1)
+        pRADEONEnt->HasCRTC2 = FALSE;
+    else
+        pRADEONEnt->HasCRTC2 = TRUE;
 
     {
 	struct drm_radeon_gem_info mminfo;