From 205efedddc3e966633d63d2d7907148a34bc67f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
Date: Wed, 22 Dec 2010 11:45:36 +0100
Subject: [PATCH] EXA: Fix crash with fill using 1x1 tile of depth < 8 (bug
 #24703).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24703 .

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit e06fa804009798ea95efa8babaabb0228dfdfe65)
---
 exa/exa_accel.c   | 2 ++
 exa/exa_unaccel.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 57029fdc5..3b71ad412 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -1057,6 +1057,8 @@ exaFillRegionSolid (DrawablePtr	pDrawable, RegionPtr pRegion, Pixel pixel,
 		*(CARD16*)pExaPixmap->sys_ptr = pixel;
 		break;
 	    case 8:
+	    case 4:
+	    case 1:
 		*(CARD8*)pExaPixmap->sys_ptr = pixel;
 	    }
 
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 8d7009813..1f91f193d 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -736,6 +736,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
 	    return pixel;
 	}
     case 8:
+    case 4:
+    case 1:
 	{
 	    CARD8 pixel;