From c9f7f10bc528ac783f4e89bdb36fc56ccdcd0088 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 29 Dec 2011 09:03:21 +0000 Subject: [PATCH] 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 --- src/sna/sna_accel.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 8d319dbd..9c04e1dc 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);