xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/vbe/vbe.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b78897d0a04a833720698901fbac9535570875e4
Author: Evgeny M. Zubok <evgeny.zubok at tochka.ru>
Date:   Thu Apr 8 03:58:21 2010 -0700

    xfree86: Change VBE version early-out to 1.2. (#22672)
    
    Reporter has an S3 Trio with DDC and VESA 1.2.
    
    Signed-off-by: Corbin Simpson <MostAwesomeDude at gmail.com>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>

diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index ef12cb8..d23e0f5 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -325,7 +325,7 @@ vbeDoEDID(vbeInfoPtr pVbe, void *unused)
 
     if (!pVbe)
         return NULL;
-    if (pVbe->version < 0x200)
+    if (pVbe->version < 0x102)
         return NULL;
 
     DDC_data = vbeReadEDID(pVbe);