xserver: Branch 'master'

[Adam Jackson]

 hw/vfb/InitOutput.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 76f25086a9ab6f0c27d9e2cd745f8463c6b3df5f
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jun 11 16:34:06 2009 -0400

    vfb: Re-enable 30bpp support

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index b4b8455..e7dd1d9 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -892,6 +892,12 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 				   (1 << DirectColor)),
 				  8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff);
 	break;
+    case 30:
+	miSetVisualTypesAndMasks (30,
+				  ((1 << TrueColor) |
+				   (1 << DirectColor)),
+				  10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff);
+	break;
     }
 
     miSetPixmapDepths ();