--- OLD/xc/programs/Xserver/dix/main.c	Thu Jan  1 00:00:00 1970
+++ NEW/xc/programs/Xserver/dix/main.c	Thu Jan  1 00:00:00 1970
@@ -137,7 +137,7 @@
  * of the number of pixels that fit in a scanline pad unit?"
  * Note that ~0 is an invalid entry (mostly for the benefit of the reader).
  */
-static int answer[6][4] = {
+static int answer[7][4] = {
 	/* pad   pad   pad     pad*/
 	/*  8     16    32    64 */
 
@@ -146,7 +146,11 @@
 	{   0,     1,    2 ,   3 },	/* 8 bits per pixel */
 	{   ~0,    0,    1 ,   2 },	/* 16 bits per pixel */
 	{   ~0,    ~0,   0 ,   1 },	/* 24 bits per pixel */
-	{   ~0,    ~0,   0 ,   1 }	/* 32 bits per pixel */
+	{   ~0,    ~0,   0 ,   1 },	/* 32 bits per pixel */
+/* the 2bpp entry really belongs between 1 and 4, but putting it here
+   means we don't have to change any entries in indexForBitsPerPixel[],
+   below, except for the 2bpp one. */
+	{   2,     3,    4,    5 }	/* 2 bits per pixel */
 };
 
 /*
@@ -155,7 +159,7 @@
  * Note that ~0 is an invalid entry (mostly for the benefit of the reader).
  */
 static int indexForBitsPerPixel[ 33 ] = {
-	~0, 0, ~0, ~0,	/* 1 bit per pixel */
+	~0, 0,  6, ~0,	/* 1 bit per pixel, 2 bits per pixel */
 	1, ~0, ~0, ~0,	/* 4 bits per pixel */
 	2, ~0, ~0, ~0,	/* 8 bits per pixel */
 	~0,~0, ~0, ~0,