xf86-video-intel: 4 commits - src/intel_dri.c src/intel_module.c src/sna/sna_render.c uxa/uxa-accel.c

[Chris Wilson]

 src/intel_dri.c      |    2 +-
 src/intel_module.c   |    1 -
 src/sna/sna_render.c |    2 +-
 uxa/uxa-accel.c      |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 4d750219925cb3199ebc6751cdbd2862dfb4cdfe
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 20 19:34:41 2012 +0000

    uxa/dri: Correct the destination of the blit after chained flip is broken
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_dri.c b/src/intel_dri.c
index 42b8ee8..f351203 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -1097,7 +1097,7 @@ void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
 				i830_dri2_del_frame_event(chain_drawable, chain);
 			} else if (!can_exchange(chain_drawable, chain->front, chain->back) ||
 				   !I830DRI2ScheduleFlip(intel, chain_drawable, chain)) {
-				I830DRI2FallbackBlitSwap(drawable,
+				I830DRI2FallbackBlitSwap(chain_drawable,
 							 chain->front,
 							 chain->back);
 
commit ca5c028c2b4d9bf02002acd484054fe427ea8d09
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 20 19:31:44 2012 +0000

    glamor: Release the drawable after passing to glamor_push_pixels
    
    An unlikely path, but a double prepare instead of a prepare/finish.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index 76425fe..27215dd 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -1027,7 +1027,7 @@ uxa_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
 				ok = glamor_push_pixels_nf(pGC, pBitmap, pDrawable, w, h, x, y);
 				uxa_finish_access(&pBitmap->drawable, UXA_GLAMOR_ACCESS_RO);
 			}
-			uxa_prepare_access(pDrawable, UXA_GLAMOR_ACCESS_RW);
+			uxa_finish_access(pDrawable, UXA_GLAMOR_ACCESS_RW);
 		}
 		if (!ok)
 			goto fallback;
commit de2de36049e2958a60f63fadffe8f54de8da1e56
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 20 19:29:31 2012 +0000

    sna: Check the correct variable for a failed allocation
    
    Having already checked 'dst' and just allocated 'src', that is who we
    should be checking.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 90e6e23..336a423 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -1725,7 +1725,7 @@ sna_render_picture_convert(struct sna *sna,
 						       pixmap->drawable.depth,
 						       picture->format),
 				    0, NULL, serverClient, &error);
-		if (dst == NULL) {
+		if (src == NULL) {
 			FreePicture(dst, 0);
 			screen->DestroyPixmap(tmp);
 			return 0;
commit deb908fda74541fba649349db279715b05d0554e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 20 19:22:32 2012 +0000

    intel: ODEV_ATTRIB_PATH is no longer printed, so kill the temporary variable
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index 5718039..e15dd90 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -543,7 +543,6 @@ intel_platform_probe(DriverPtr driver,
 		     struct xf86_platform_device *dev,
 		     intptr_t match_data)
 {
-	char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
 	unsigned scrn_flags = 0;
 
 	if (!dev->pdev)