xserver: Branch 'master'

[Jeff Chua]

On 8/9/07, Eric Anholt <eric at anholt.net> wrote:

> If you've had strange display mode issues with recent X Servers or with
> any version of xf86-video-intel since 2.0.0, it'll likely be worth
> updating your server and trying this change out.

After upgrading pixmap, xserver no longer compile. Here's a patch for it.

Thanks,
Jeff.


--- xserver/fb/fbpict.c.org	2007-08-09 07:17:19 +0800
+++ xserver/fb/fbpict.c	2007-08-09 07:17:25 +0800
@@ -442,7 +442,7 @@
  void
  free_pixman_pict (PicturePtr pict, pixman_image_t *image)
  {
-    if (image && pixman_image_unref (image) && pict->pDrawable)
+    if (image && pict->pDrawable)
  	fbFinishAccess (pict->pDrawable);
  }