diff --git a/ChangeLog b/ChangeLog
index eb03ab973..e0dd8eb00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-01  Eric Anholt  <anholt@FreeBSD.org>
+
+	* exa/exa_priv.h:
+	Use fb's depth-to-planemask computation, which doesn't suffer from
+	getting a 1 planemask at depth 32.  Fixes Get/PutImage xtest tests.
+
 2006-04-01  Daniel Stone  <daniel@freedesktop.org>
 
 	* configure.ac:
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 5effca506..3c09560c2 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -137,8 +137,8 @@ extern int exaPixmapPrivateIndex;
  * pixel values for pDrawable.
  */
 #define EXA_PM_IS_SOLID(_pDrawable, _pm) \
-	(((_pm) & ((1 << (_pDrawable)->bitsPerPixel) - 1)) == \
-	 ((1 << (_pDrawable)->bitsPerPixel) - 1))
+	(((_pm) & FbFullMask((_pDrawable)->depth)) == \
+	 FbFullMask((_pDrawable)->depth))
 
 #define EXA_PIXMAP_SCORE_MOVE_IN    10
 #define EXA_PIXMAP_SCORE_MAX	    20