Mon Nov 25 02:50:32 PST 2013

configure.ac                     |    2 +-
 src/Makefile.am                  |   10 +++++-----
 src/legacy/i810/Makefile.am      |    2 +-
 src/legacy/i810/i810_common.h    |    4 ++--
 src/legacy/i810/i810_cursor.c    |    4 ++--
 src/legacy/i810/i810_memory.c    |    2 +-
 src/legacy/i810/i810_ring.h      |    2 +-
 src/legacy/i810/xvmc/Makefile.am |    4 ++--
 src/sna/Makefile.am              |   12 ++++++------
 src/sna/fb/fbgc.c                |    1 -
 src/sna/fb/fbseg.c               |    1 -
 src/sna/kgem.c                   |    2 ++
 src/sna/kgem_debug_gen2.c        |    1 -
 src/sna/sna.h                    |    2 +-
 src/sna/sna_accel.c              |    2 +-
 src/sna/sna_blt.c                |    6 +++---
 src/sna/sna_dri.c                |    1 -
 src/sna/sna_driver.c             |    7 ++-----
 src/sna/sna_glyphs.c             |    2 --
 src/sna/sna_trapezoids.c         |    5 ++---
 src/sna/sna_trapezoids_mono.c    |    7 ++-----
 src/sna/sna_video.c              |    1 -
 src/sna/sna_video_sprite.c       |    5 ++++-
 src/uxa/Makefile.am              |   14 +++++++-------
 src/uxa/i965_3d.c                |    1 -
 src/uxa/i965_render.c            |   11 ++++++-----
 src/uxa/intel.h                  |    2 +-
 src/uxa/intel_display.c          |    1 -
 src/uxa/intel_dri.c              |   14 +++++++-------
 src/uxa/intel_driver.c           |   11 ++---------
 src/uxa/uxa-accel.c              |    3 +--
 src/uxa/uxa-glyphs.c             |    4 +---
 src/uxa/uxa-render.c             |    1 -
 src/uxa/uxa-unaccel.c            |    4 ----
 test/Makefile.am                 |    4 ++--
 test/lowlevel-blt-bench.c        |    2 +-
 tools/Makefile.am                |    4 ++--
 tools/virtual.c                  |    1 -
 38 files changed, 68 insertions(+), 94 deletions(-)

New commits:
commit 4c4458e8a30920d065ca5db5d3ca3cc49454b869
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 25 10:01:00 2013 +0000

    sna/trapezoids: trapezoids_bounds() reports not-empty, so use it
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 7d133d8..2dcb6d3 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -288,8 +288,7 @@ trapezoids_fallback(struct sna *sna,
 
 		trapezoid_origin(&traps[0].left, &dst_x, &dst_y);
 
-		trapezoids_bounds(ntrap, traps, &bounds);
-		if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
+		if (!trapezoids_bounds(ntrap, traps, &bounds))
 			return;
 
 		DBG(("%s: bounds (%d, %d), (%d, %d)\n", __FUNCTION__,
diff --git a/src/sna/sna_trapezoids_mono.c b/src/sna/sna_trapezoids_mono.c
index dd629b6..641c6e3 100644
--- a/src/sna/sna_trapezoids_mono.c
+++ b/src/sna/sna_trapezoids_mono.c
@@ -769,8 +769,7 @@ mono_trapezoids_span_converter(struct sna *sna,
 
 	trapezoid_origin(&traps[0].left, &dst_x, &dst_y);
 
-	trapezoids_bounds(ntrap, traps, &extents);
-	if (extents.y1 >= extents.y2 || extents.x1 >= extents.x2)
+	if (!trapezoids_bounds(ntrap, traps, &extents))
 		return true;
 
 	DBG(("%s: extents (%d, %d), (%d, %d)\n",
@@ -1049,9 +1048,7 @@ mono_trapezoid_span_inplace(struct sna *sna,
 	int was_clear;
 	int x, y, n;
 
-	trapezoids_bounds(ntrap, traps, &mono.clip.extents);
-	if (mono.clip.extents.y1 >= mono.clip.extents.y2 ||
-	    mono.clip.extents.x1 >= mono.clip.extents.x2)
+	if (!trapezoids_bounds(ntrap, traps, &mono.clip.extents))
 		return true;
 
 	DBG(("%s: extents (%d, %d), (%d, %d)\n",
commit af4995d74bd3ee3ed8f17c7c04c8d3acaaecebc6
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:57:19 2013 +0000

    sna: Handle failure to disable old plane when switching CRTCs
    
    If we fail to disable the old plane, abort the PutImage and report the
    error.
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c
index b6e7b94..b6a7950 100644
--- a/src/sna/sna_video_sprite.c
+++ b/src/sna/sna_video_sprite.c
@@ -315,7 +315,10 @@ sna_video_sprite_show(struct sna *sna,
 		if (video->plane) {
 			memset(&s, 0, sizeof(s));
 			s.plane_id = video->plane;
-			drmIoctl(video->sna->kgem.fd, DRM_IOCTL_MODE_SETPLANE, &s);
+			if (drmIoctl(video->sna->kgem.fd, DRM_IOCTL_MODE_SETPLANE, &s)) {
+				DBG(("SET_PLANE failed to turn off existing sprite: ret=%d\n", errno));
+				return false;
+			}
 		}
 		video->plane = s.plane_id;
 	}
commit 00dcb4f22942b2d40253a7b43105e73e260216cf
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:35 2013 +0100

    uxa: fix order of inline Bool
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/uxa/uxa-accel.c b/src/uxa/uxa-accel.c
index f1ae9a1..cb465b8 100644
--- a/src/uxa/uxa-accel.c
+++ b/src/uxa/uxa-accel.c
@@ -235,7 +235,7 @@ fallback:
 	}
 }
 
-static Bool inline
+static inline Bool
 uxa_copy_n_to_n_two_dir(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
 			GCPtr pGC, BoxPtr pbox, int nbox, int dx, int dy)
 {
commit 175b8711f8c90e7977aec5564f5c29588fa14469
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:34 2013 +0100

    uxa,legacy: use unsigned for comparition of unsigned
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/legacy/i810/i810_common.h b/src/legacy/i810/i810_common.h
index efa2a7d..4cc10e8 100644
--- a/src/legacy/i810/i810_common.h
+++ b/src/legacy/i810/i810_common.h
@@ -65,7 +65,7 @@
 
 static inline void memset_volatile(volatile void *b, int c, size_t len)
 {
-    int i;
+    unsigned i;
     
     for (i = 0; i < len; i++)
 	((volatile char *)b)[i] = c;
@@ -74,7 +74,7 @@ static inline void memset_volatile(volatile void *b, int c, size_t len)
 static inline void memcpy_volatile(volatile void *dst, const void *src,
 				   size_t len)
 {
-    int i;
+    unsigned i;
     
     for (i = 0; i < len; i++)
 	((volatile char *)dst)[i] = ((const volatile char *)src)[i];
diff --git a/src/legacy/i810/i810_ring.h b/src/legacy/i810/i810_ring.h
index e6e354f..a3be86e 100644
--- a/src/legacy/i810/i810_ring.h
+++ b/src/legacy/i810/i810_ring.h
@@ -73,7 +73,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define BEGIN_LP_RING(n)						\
     unsigned int outring, ringmask, ringused = 0;			\
     volatile unsigned char *virt;					\
-    int needed;								\
+    unsigned needed;								\
     if ((n) & 1)							\
 	ErrorF("BEGIN_LP_RING called with odd argument: %d\n", n);	\
     if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC))			\
diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c
index de36fcb..7f35863 100644
--- a/src/uxa/uxa-glyphs.c
+++ b/src/uxa/uxa-glyphs.c
@@ -146,7 +146,7 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen)
 		PIXMAN_a8,
 		PIXMAN_a8r8g8b8,
 	};
-	int i;
+	unsigned i;
 
 	if (uxa_screen->glyph_cache_initialized)
 		return TRUE;
diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c
index 0cea0a8..f2b6863 100644
--- a/test/lowlevel-blt-bench.c
+++ b/test/lowlevel-blt-bench.c
@@ -121,7 +121,7 @@ static void bench(struct test *t, enum target target, int op, int sf)
 int main(int argc, char **argv)
 {
 	struct test test;
-	int op, sf;
+	unsigned op, sf;
 
 	test_init(&test, argc, argv);
 
commit 7b235c92bbc6c7306ffef8caac5f07448c78d956
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:32 2013 +0100

    sna: Add missing va_end
    
    Put va_end() into error paths
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 8775d2b..7e36554 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4804,6 +4804,7 @@ bool kgem_check_bo(struct kgem *kgem, ...)
 
 		if (needs_semaphore(kgem, bo)) {
 			DBG(("%s: flushing for required semaphore\n", __FUNCTION__));
+			va_end(ap);
 			return false;
 		}
 
@@ -4974,6 +4975,7 @@ bool kgem_check_many_bo_fenced(struct kgem *kgem, ...)
 
 		if (needs_semaphore(kgem, bo)) {
 			DBG(("%s: flushing for required semaphore\n", __FUNCTION__));
+			va_end(ap);
 			return false;
 		}
 
commit 318f100d7337955c099fecb86d206c406779fafe
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:31 2013 +0100

    uxa: Avoid relying on an assert and cleanup iterator
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/uxa/i965_render.c b/src/uxa/i965_render.c
index 404fc12..74f57af 100644
--- a/src/uxa/i965_render.c
+++ b/src/uxa/i965_render.c
@@ -1260,16 +1260,16 @@ static drm_intel_bo *gen4_create_cc_unit_state(intel_screen_private *intel)
 
 static uint32_t i965_get_card_format(PicturePtr picture)
 {
-	int i;
+	unsigned i;
 
 	for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
-	     i++) {
+	     i++)
 		if (i965_tex_formats[i].fmt == picture->format)
-			break;
-	}
+			return i965_tex_formats[i].card_fmt;
+
 	assert(i != sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]));
 
-	return i965_tex_formats[i].card_fmt;
+	return 0;
 }
 
 static sampler_state_filter_t sampler_state_filter_from_picture(int filter)
commit a110637ef2a37505ee68447cf66763af4cabfc00
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:30 2013 +0100

    Fix indentation for incorrectly shifted statements
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/legacy/i810/i810_cursor.c b/src/legacy/i810/i810_cursor.c
index 2ac03e9..98cc36a 100644
--- a/src/legacy/i810/i810_cursor.c
+++ b/src/legacy/i810/i810_cursor.c
@@ -132,8 +132,8 @@ static void I810LoadCursorARGB (ScrnInfoPtr pScrn, CursorPtr pCurs)
    {
       for (x = 0; x < w; x++)
          *pcurs++ = *image++;
-         for (; x < 64; x++)
-            *pcurs++ = 0;
+      for (; x < 64; x++)
+         *pcurs++ = 0;
    }
 
    for (; y < 64; y++)
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 8f7b8a3..32179bf 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -2355,9 +2355,9 @@ fill:
 			hint |= PREFER_GPU;
 			if (dst->pCompositeClip->data == NULL && (width | height))
 				hint |= IGNORE_CPU;
-				if (width == tmp->dst.pixmap->drawable.width &&
-				    height == tmp->dst.pixmap->drawable.height)
-					hint |= REPLACES;
+			if (width == tmp->dst.pixmap->drawable.width &&
+			    height == tmp->dst.pixmap->drawable.height)
+				hint |= REPLACES;
 		}
 		tmp->dst.bo = sna_drawable_use_bo(dst->pDrawable, hint,
 						  &dst_box, &tmp->damage);
commit b419691e277af0881baa7daac17af424dc1337b1
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:29 2013 +0100

    uxa: rename some local variable to not shadow global ones
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c
index 1a9bad0..08a0bd4 100644
--- a/src/uxa/intel_dri.c
+++ b/src/uxa/intel_dri.c
@@ -863,7 +863,7 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
 	}
 
 	if (intel->back_buffer == NULL) {
-		I830DRI2BufferPrivatePtr priv;
+		I830DRI2BufferPrivatePtr drvpriv;
 		PixmapPtr front_pixmap, back_pixmap;
 		ScreenPtr screen;
 
@@ -886,8 +886,8 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
 
 		if ((intel->uxa_flags & UXA_USE_GLAMOR)) {
 			screen = draw->pScreen;
-			priv = info->front->driverPrivate;
-			front_pixmap = priv->pixmap;
+			drvpriv = info->front->driverPrivate;
+			front_pixmap = drvpriv->pixmap;
 
 			back_pixmap = intel_glamor_create_back_pixmap(screen,
 								      front_pixmap,
@@ -1563,8 +1563,8 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
 	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DRI2InfoRec info;
-	int dri2_major = 1;
-	int dri2_minor = 0;
+	int dri2scr_major = 1;
+	int dri2scr_minor = 0;
 #if DRI2INFOREC_VERSION >= 4
 	const char *driverNames[1];
 #endif
@@ -1576,9 +1576,9 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
 	}
 
 	if (xf86LoaderCheckSymbol("DRI2Version"))
-		DRI2Version(&dri2_major, &dri2_minor);
+		DRI2Version(&dri2scr_major, &dri2scr_minor);
 
-	if (dri2_minor < 1) {
+	if (dri2scr_minor < 1) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "DRI2 requires DRI2 module version 1.1.0 or later\n");
 		return FALSE;
commit 6f066b6714df850c5ea42dbde2296803c5b06da0
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:28 2013 +0100

    uxa: Ensure mask_picture is defined
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/uxa/i965_render.c b/src/uxa/i965_render.c
index 3586967..404fc12 100644
--- a/src/uxa/i965_render.c
+++ b/src/uxa/i965_render.c
@@ -2109,6 +2109,7 @@ i965_prepare_composite(int op, PicturePtr source_picture,
 	}
 
 	if (mask) {
+		assert(mask_picture != NULL);
 		if (mask_picture->componentAlpha &&
 		    PICT_FORMAT_RGB(mask_picture->format)) {
 			if (i965_blend_op[op].src_alpha) {
commit ea18b7780e7d0d7fcd36b656a4fd974fb9d7137d
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:27 2013 +0100

    Cast to use unsigned math
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/legacy/i810/i810_memory.c b/src/legacy/i810/i810_memory.c
index bd7c8db..c3de277 100644
--- a/src/legacy/i810/i810_memory.c
+++ b/src/legacy/i810/i810_memory.c
@@ -73,7 +73,7 @@ I810AllocHigh(I810MemRange * result, I810MemRange * pool, int size)
 int
 I810AllocateGARTMemory(ScrnInfoPtr pScrn)
 {
-   unsigned long size = pScrn->videoRam * 1024;
+   unsigned long size = pScrn->videoRam * 1024UL;
    I810Ptr pI810 = I810PTR(pScrn);
    int key;
    long tom = 0;
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index a68e5fb..8abdf84 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2113,7 +2113,7 @@ skip_inplace_map:
 		    pixmap->drawable.bitsPerPixel == 8 ||
 		    priv->clear_color == (1 << pixmap->drawable.depth) - 1) {
 			memset(pixmap->devPrivate.ptr, priv->clear_color,
-			       pixmap->devKind * pixmap->drawable.height);
+			       (size_t)pixmap->devKind * pixmap->drawable.height);
 		} else {
 			pixman_fill(pixmap->devPrivate.ptr,
 				    pixmap->devKind/sizeof(uint32_t),
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index a0a8b5b..7d133d8 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -902,7 +902,7 @@ triangles_fallback(CARD8 op,
 		if (!scratch)
 			return;
 
-		memset(scratch->devPrivate.ptr, 0, scratch->devKind*height);
+		memset(scratch->devPrivate.ptr, 0, (size_t)scratch->devKind*height);
 		image = pixman_image_create_bits(format, width, height,
 						 scratch->devPrivate.ptr,
 						 scratch->devKind);
commit 34057611c67b751c43d6bd70a7d5993708262cd2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 25 09:36:32 2013 +0000

    Correct type of uevent_handler
    
    xf86AddGeneralHandler returns an opaque pointer, not a function pointer.
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna.h b/src/sna/sna.h
index b3e38a3..8a7a94f 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -329,7 +329,7 @@ struct sna {
 
 #if HAVE_UDEV
 	struct udev_monitor *uevent_monitor;
-	InputHandlerProc uevent_handler;
+	pointer uevent_handler;
 #endif
 
 	struct {
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index d89fb1f..4a96faf 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -766,10 +766,8 @@ sna_uevent_init(ScrnInfoPtr scrn)
 		return;
 	}
 
-	sna->uevent_handler =
-		xf86AddGeneralHandler(udev_monitor_get_fd(mon),
-				      sna_handle_uevents,
-				      scrn);
+	sna->uevent_handler = xf86AddGeneralHandler(udev_monitor_get_fd(mon),
+						    sna_handle_uevents, scrn);
 	if (!sna->uevent_handler) {
 		udev_monitor_unref(mon);
 		udev_unref(u);
diff --git a/src/uxa/intel.h b/src/uxa/intel.h
index ded975f..6ac770e 100644
--- a/src/uxa/intel.h
+++ b/src/uxa/intel.h
@@ -351,7 +351,7 @@ typedef struct intel_screen_private {
 	unsigned debug_flush;
 #if HAVE_UDEV
 	struct udev_monitor *uevent_monitor;
-	InputHandlerProc uevent_handler;
+	pointer uevent_handler;
 #endif
 	Bool has_prime_vmap_flush;
 } intel_screen_private;
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index e035973..46e06df 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -875,10 +875,8 @@ I830UeventInit(ScrnInfoPtr scrn)
 		return;
 	}
 
-	intel->uevent_handler =
-		xf86AddGeneralHandler(udev_monitor_get_fd(mon),
-				I830HandleUEvents,
-				scrn);
+	intel->uevent_handler = xf86AddGeneralHandler(udev_monitor_get_fd(mon),
+						      I830HandleUEvents, scrn);
 	if (!intel->uevent_handler) {
 		udev_monitor_unref(mon);
 		udev_unref(u);
commit d2df10e28fa35d29b539dc52c61f710910b75831
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:25 2013 +0100

    Remove uneeded headers
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/sna/fb/fbgc.c b/src/sna/fb/fbgc.c
index 83956c4..9943794 100644
--- a/src/sna/fb/fbgc.c
+++ b/src/sna/fb/fbgc.c
@@ -23,7 +23,6 @@
 
 #include "fb.h"
 #include <gcstruct.h>
-#include <migc.h>
 #include <scrnintstr.h>
 
 /*
diff --git a/src/sna/fb/fbseg.c b/src/sna/fb/fbseg.c
index 67ad389..58d2266 100644
--- a/src/sna/fb/fbseg.c
+++ b/src/sna/fb/fbseg.c
@@ -25,7 +25,6 @@
 
 #include "fb.h"
 #include "fbclip.h"
-#include <mi.h>
 #include <miline.h>
 #include <scrnintstr.h>
 
diff --git a/src/sna/kgem_debug_gen2.c b/src/sna/kgem_debug_gen2.c
index 09f3873..3f91c29 100644
--- a/src/sna/kgem_debug_gen2.c
+++ b/src/sna/kgem_debug_gen2.c
@@ -34,7 +34,6 @@
 #include <assert.h>
 
 #include "sna.h"
-#include "sna_reg.h"
 
 #include "gen2_render.h"
 
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index a218be3..99f95ae 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -42,7 +42,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 
 #include "sna.h"
-#include "sna_reg.h"
 #include "intel_options.h"
 
 #include <xf86drm.h>
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 1832cd8..d89fb1f 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -57,7 +57,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <xf86RandR12.h>
 #include <mi.h>
 #include <micmap.h>
-#include <mipict.h>
 
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 759e415..9b272ef 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -67,8 +67,6 @@
 #include "sna_render_inline.h"
 #include "fb/fbpict.h"
 
-#include <mipict.h>
-
 #define FALLBACK 0
 #define NO_GLYPH_CACHE 0
 #define NO_GLYPHS_TO_DST 0
diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c
index 132ca28..7f1eeb2 100644
--- a/src/sna/sna_video.c
+++ b/src/sna/sna_video.c
@@ -60,7 +60,6 @@
 #include "intel_options.h"
 
 #include <xf86xv.h>
-#include <X11/extensions/Xv.h>
 
 #ifdef SNA_XVMC
 #define _SNA_XVMC_SERVER_
diff --git a/src/uxa/i965_3d.c b/src/uxa/i965_3d.c
index fe2d9aa..757a979 100644
--- a/src/uxa/i965_3d.c
+++ b/src/uxa/i965_3d.c
@@ -30,7 +30,6 @@
 #include "intel.h"
 #include "i965_reg.h"
 #include "brw_defines.h"
-#include "brw_structs.h"
 
 void
 gen6_upload_invariant_states(intel_screen_private *intel)
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 3c2f964..9bda006 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -35,7 +35,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include <poll.h>
 #include <sys/ioctl.h>
 
 #include "xorg-server.h"
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 431c34b..e035973 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -53,13 +53,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "compiler.h"
 #include "mipointer.h"
 #include "micmap.h"
-#include "shadowfb.h"
 #include <X11/extensions/randr.h>
 #include "fb.h"
 #include "miscstruct.h"
 #include "dixstruct.h"
 #include "xf86xv.h"
-#include <X11/extensions/Xv.h>
 #include "shadow.h"
 #include "intel.h"
 #include "intel_video.h"
@@ -70,12 +68,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "intel_xvmc.h"
 #endif
 
-#include "legacy/legacy.h"
 #include "uxa.h"
 
-#include <sys/ioctl.h>
 #include "i915_drm.h"
-#include <xf86drmMode.h>
 
 #include "intel_glamor.h"
 #include "intel_options.h"
diff --git a/src/uxa/uxa-accel.c b/src/uxa/uxa-accel.c
index 27215dd..f1ae9a1 100644
--- a/src/uxa/uxa-accel.c
+++ b/src/uxa/uxa-accel.c
@@ -36,7 +36,6 @@
 #include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "uxa.h"
-#include "mipict.h"
 
 static void
 uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c
index b022c83..de36fcb 100644
--- a/src/uxa/uxa-glyphs.c
+++ b/src/uxa/uxa-glyphs.c
@@ -68,8 +68,6 @@
 #include "uxa-glamor.h"
 #include "common.h"
 
-#include "mipict.h"
-
 /* Width of the pixmaps we use for the caches; this should be less than
  * max texture size of the driver; this may need to actually come from
  * the driver.
diff --git a/src/uxa/uxa-render.c b/src/uxa/uxa-render.c
index d783ea2..992a008 100644
--- a/src/uxa/uxa-render.c
+++ b/src/uxa/uxa-render.c
@@ -30,7 +30,6 @@
 
 #include "uxa-priv.h"
 #include "uxa-glamor.h"
-#include <xorgVersion.h>
 
 #ifdef RENDER
 #include "mipict.h"
diff --git a/src/uxa/uxa-unaccel.c b/src/uxa/uxa-unaccel.c
index f431049..6d383e4 100644
--- a/src/uxa/uxa-unaccel.c
+++ b/src/uxa/uxa-unaccel.c
@@ -23,10 +23,6 @@
 
 #include "uxa-priv.h"
 
-#ifdef RENDER
-#include "mipict.h"
-#endif
-
 /*
  * These functions wrap the low-level fb rendering functions and
  * synchronize framebuffer/accelerated drawing by stalling until
diff --git a/tools/virtual.c b/tools/virtual.c
index a02db68..a475ba5 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -61,7 +61,6 @@
 #include <signal.h>
 #include <getopt.h>
 #include <limits.h>
-#include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <assert.h>
commit 41be7e9d490633a65aa1e0c9f76acfb67869288f
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:24 2013 +0100

    config apostrophe
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/configure.ac b/configure.ac
index 0783d61..e377584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,7 +283,7 @@ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 
 AC_ARG_ENABLE(sna,
 	      AS_HELP_STRING([--enable-sna],
-			     [Enable SandyBridge's New Acceleration (SNA) [default=auto]]),
+			     [Enable SandyBridge\'s New Acceleration (SNA) [default=auto]]),
 	      [SNA="$enableval"],
 	      [SNA=auto])
 
commit 2275ef581ee1a1c45a45df40f952779f62fb53ed
Author: Zdenek Kabelac <zkabelac at redhat.com>
Date:   Mon Nov 25 09:09:20 2013 +0100

    Makefile convert @var@ to $(var)
    
    Avoid using @var@ since this could not be easily overwritten through
    'make var=xxx' option which is normally available.
    For Makefile.am users should avoid using @var at .
    
    Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index b0781ca..e87f030 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,16 +28,16 @@ SUBDIRS = render_program legacy
 
 AM_CFLAGS = \
 	@CWARNFLAGS@ \
-	@XORG_CFLAGS@ \
-	@DRM_CFLAGS@ \
-	@PCIACCESS_CFLAGS@ \
+	$(XORG_CFLAGS) \
+	$(DRM_CFLAGS) \
+	$(PCIACCESS_CFLAGS) \
 	@NOWARNFLAGS@ \
 	$(NULL)
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
-intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(XORG_LIBS)
+intel_drv_ladir = $(moduledir)/drivers
+intel_drv_la_LIBADD = legacy/liblegacy.la $(PCIACCESS_LIBS) $(XORG_LIBS)
 
 if SNA
 SUBDIRS += sna
diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am
index 8414c5f..8846e4e 100644
--- a/src/legacy/i810/Makefile.am
+++ b/src/legacy/i810/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = xvmc
 
 noinst_LTLIBRARIES = liblegacy-i810.la
 
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ @PCIACCESS_CFLAGS@ \
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DRM_CFLAGS) $(DRI1_CFLAGS) $(PCIACCESS_CFLAGS) \
 	    -I$(top_srcdir)/src \
 	    -I$(top_srcdir)/src/legacy \
 	    $(NULL)
diff --git a/src/legacy/i810/xvmc/Makefile.am b/src/legacy/i810/xvmc/Makefile.am
index 7f28b8b..6c40f20 100644
--- a/src/legacy/i810/xvmc/Makefile.am
+++ b/src/legacy/i810/xvmc/Makefile.am
@@ -5,7 +5,7 @@ endif
 libI810XvMC_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
 
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ -DTRUE=1 -DFALSE=0
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DRM_CFLAGS) $(DRI1_CFLAGS) -DTRUE=1 -DFALSE=0
 
 libI810XvMC_la_LDFLAGS = -version-number 1:0:0
-libI810XvMC_la_LIBADD = @DRI1_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
+libI810XvMC_la_LIBADD = $(DRI1_LIBS) $(DRM_LIBS) $(XVMCLIB_LIBS)
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index cdcd920..604ae25 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -22,21 +22,21 @@ SUBDIRS = brw fb
 
 AM_CFLAGS = \
 	@CWARNFLAGS@ \
+	@NOWARNFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/render_program \
-	@XORG_CFLAGS@ \
-	@UDEV_CFLAGS@ \
-	@DRM_CFLAGS@ \
-	@NOWARNFLAGS@
+	$(XORG_CFLAGS) \
+	$(UDEV_CFLAGS) \
+	$(DRM_CFLAGS) \
 	$(NULL)
 
 if VALGRIND
-AM_CFLAGS += @VALGRIND_CFLAGS@
+AM_CFLAGS += $(VALGRIND_CFLAGS)
 endif
 
 noinst_LTLIBRARIES = libsna.la
 libsna_la_LDFLAGS = -pthread
-libsna_la_LIBADD = @UDEV_LIBS@ -lm @DRM_LIBS@ brw/libbrw.la fb/libfb.la
+libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la
 
 libsna_la_SOURCES = \
 	atomic.h \
diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am
index 971ac21..4fa1b8c 100644
--- a/src/uxa/Makefile.am
+++ b/src/uxa/Makefile.am
@@ -18,12 +18,12 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@
-AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@
+AM_CFLAGS = @CWARNFLAGS@ $(XORG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS)
+AM_CFLAGS += $(UDEV_CFLAGS) $(DRM_CFLAGS) $(DRMINTEL_CFLAGS)
 AM_CFLAGS += -I$(top_srcdir)/xvmc -I$(top_srcdir)/src -I$(top_srcdir)/src/render_program
 
 noinst_LTLIBRARIES = libuxa.la
-libuxa_la_LIBADD = @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@
+libuxa_la_LIBADD = $(UDEV_LIBS) $(DRMINTEL_LIBS) $(DRM_LIBS)
 libuxa_la_SOURCES = \
 	brw_defines.h \
 	brw_structs.h \
@@ -62,21 +62,21 @@ libuxa_la_SOURCES = \
 	$(NULL)
 
 if GLAMOR
-AM_CFLAGS += @LIBGLAMOR_CFLAGS@
-libuxa_la_LIBADD += @LIBGLAMOR_LIBS@
+AM_CFLAGS += $(LIBGLAMOR_CFLAGS)
+libuxa_la_LIBADD += $(LIBGLAMOR_LIBS)
 libuxa_la_SOURCES += \
 	 intel_glamor.c \
 	 $(NULL)
 endif
 
 if DRI2
-AM_CFLAGS += @DRI2_CFLAGS@
+AM_CFLAGS += $(DRI2_CFLAGS)
 libuxa_la_SOURCES += \
 	intel_dri.c \
 	$(NULL)
 libuxa_la_LIBADD += \
 	$(DRI2_LIBS) \
-	@CLOCK_GETTIME_LIBS@ \
+	$(CLOCK_GETTIME_LIBS) \
 	$(NULL)
 endif
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 0b5f8a0..5c2a3e1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -32,8 +32,8 @@ check_PROGRAMS = $(stress_TESTS)
 
 noinst_PROGRAMS = lowlevel-blt-bench
 
-AM_CFLAGS = @CWARNFLAGS@ @X11_CFLAGS@ @DRM_CFLAGS@
-LDADD = libtest.la @X11_LIBS@ @DRM_LIBS@ @CLOCK_GETTIME_LIBS@
+AM_CFLAGS = @CWARNFLAGS@ $(X11_CFLAGS) $(DRM_CFLAGS)
+LDADD = libtest.la $(X11_LIBS) $(DRM_LIBS) $(CLOCK_GETTIME_LIBS)
 
 noinst_LTLIBRARIES = libtest.la
 libtest_la_SOURCES = \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index de7e9b4..d294e2a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
 
 AM_CFLAGS = \
 	@CWARNFLAGS@ \
-	@TOOL_CFLAGS@ \
+	$(TOOL_CFLAGS) \
 	@NOWARNFLAGS@ \
 	$(NULL)
 
@@ -33,7 +33,7 @@ intel_virtual_output_SOURCES = \
 	virtual.c \
 	$(NULL)
 
-intel_virtual_output_LDADD = @TOOL_LIBS@
+intel_virtual_output_LDADD = $(TOOL_LIBS)
 
 EXTRA_DIST = intel-virtual-output.man
 CLEANFILES = $(driverman_DATA)
