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

Chris Wilson ickle at kemper.freedesktop.org
Thu Dec 29 01:05:17 PST 2011


 src/Makefile.am     |    2 +-
 src/sna/sna_accel.c |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit c9f7f10bc528ac783f4e89bdb36fc56ccdcd0088
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 29 09:03:21 2011 +0000

    sna: Be paranoid and check for errors from mmapping the bo
    
    Now that the error propagation is actually in place, we may as well use
    it.
    
    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 8d319db..9c04e1d 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -692,6 +692,9 @@ sna_pixmap_move_to_cpu(PixmapPtr pixmap, unsigned int flags)
 			pixmap->devPrivate.ptr =
 				kgem_bo_map(&sna->kgem, priv->gpu_bo,
 					    PROT_WRITE);
+			if (pixmap->devPrivate.ptr == NULL)
+				goto skip_inplace_map;
+
 			priv->mapped = 1;
 
 			sna_damage_all(&priv->gpu_damage,
@@ -885,6 +888,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
 				pixmap->devPrivate.ptr =
 					kgem_bo_map(&sna->kgem, priv->gpu_bo,
 						    PROT_WRITE);
+				if (pixmap->devPrivate.ptr == NULL)
+					return false;
+
 				priv->mapped = 1;
 
 				sna_damage_subtract(&priv->cpu_damage, region);
@@ -920,6 +926,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
 			pixmap->devPrivate.ptr =
 				kgem_bo_map(&sna->kgem, priv->gpu_bo,
 					    PROT_WRITE);
+			if (pixmap->devPrivate.ptr == NULL)
+				return false;
+
 			priv->mapped = 1;
 
 			sna_damage_subtract(&priv->cpu_damage, region);
commit 98e053503aed292beb2006043e8508d59262c7c2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 29 08:50:53 2011 +0000

    uxa: Depend upon DRI2 not DRI
    
    The symbols required for building intel_dri.c are checked during
    configure under the DRI2 defines.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/Makefile.am b/src/Makefile.am
index 62ac04f..a632543 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,7 @@ intel_drv_la_SOURCES += \
 	 $(NULL)
 endif
 
-if DRI
+if DRI2
 intel_drv_la_SOURCES += \
 	intel_dri.c \
 	$(NULL)


More information about the xorg-commit mailing list