xf86-video-intel: 2 commits - src/intel_module.c src/sna/sna_accel.c

[Chris Wilson]

 src/intel_module.c  |    4 +++-
 src/sna/sna_accel.c |   15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 027569bf83fc6d67dca7cfd65fdfa37ef6b47204
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Aug 20 12:55:20 2012 +0100

    Missing includes for b5b76ad849b
    
    The warnings of implicit function declarations were lost amongst the
    noise.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index 0a70b24..edea48d 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -28,8 +28,10 @@
 #include "config.h"
 #endif
 
+#include <unistd.h>
 #include <xf86_OSproc.h>
 #include <xf86Parser.h>
+#include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <i915_drm.h>
 
@@ -394,7 +396,7 @@ static Bool has_kernel_mode_setting(struct pci_device *dev)
 
 		gp.param = I915_PARAM_HAS_GEM;
 		gp.value = &ret;
-		(void)drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+		(void)drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
 		close(fd);
 	}
 
commit f1b259f627814c765ea93d8c839ee7533249974f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Aug 20 12:51:51 2012 +0100

    sna: Add a modicum of DBG for PolyFillRect
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 8941be9..e592b10 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -11512,11 +11512,10 @@ sna_poly_fill_rect(DrawablePtr draw, GCPtr gc, int n, xRectangle *rect)
 	     region.extents.x2, region.extents.y2,
 	     flags));
 
-	if (FORCE_FALLBACK)
-		goto fallback;
-
-	if (!ACCEL_POLY_FILL_RECT)
+	if (FORCE_FALLBACK || !ACCEL_POLY_FILL_RECT) {
+		DBG(("%s: fallback forced\n", __FUNCTION__));
 		goto fallback;
+	}
 
 	if (priv == NULL) {
 		DBG(("%s: fallback -- unattached\n", __FUNCTION__));
@@ -11568,13 +11567,17 @@ sna_poly_fill_rect(DrawablePtr draw, GCPtr gc, int n, xRectangle *rect)
 
 	/* If the source is already on the GPU, keep the operation on the GPU */
 	if (gc->fillStyle == FillTiled) {
-		if (!gc->tileIsPixel && sna_pixmap_is_gpu(gc->tile.pixmap))
+		if (!gc->tileIsPixel && sna_pixmap_is_gpu(gc->tile.pixmap)) {
+			DBG(("%s: source is already on the gpu\n"));
 			hint |= PREFER_GPU | FORCE_GPU;
+		}
 	}
 
 	bo = sna_drawable_use_bo(draw, hint, &region.extents, &damage);
-	if (bo == NULL)
+	if (bo == NULL) {
+		DBG(("%s: not using GPU, hint=%x\n", __FUNCTION__, hint));
 		goto fallback;
+	}
 
 	if (gc_is_solid(gc, &color)) {
 		DBG(("%s: solid fill [%08x], testing for blt\n",