Mesa (master): r600g: don't unmap if we haven't mapped

Dave Airlie airlied at kemper.freedesktop.org
Fri May 13 04:04:26 UTC 2011


Module: Mesa
Branch: master
Commit: c7b1497f4ece1f23ef934fa97ad9040350bc0f23
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7b1497f4ece1f23ef934fa97ad9040350bc0f23

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 13 14:03:47 2011 +1000

r600g: don't unmap if we haven't mapped

should fix https://bugs.freedesktop.org/show_bug.cgi?id=37157

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/winsys/r600/drm/radeon_bo.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/r600/drm/radeon_bo.c b/src/gallium/winsys/r600/drm/radeon_bo.c
index 9a534dd..cd817fc 100644
--- a/src/gallium/winsys/r600/drm/radeon_bo.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo.c
@@ -64,8 +64,10 @@ int radeon_bo_fixed_map(struct radeon *radeon, struct radeon_bo *bo)
 
 static void radeon_bo_fixed_unmap(struct radeon *radeon, struct radeon_bo *bo)
 {
-	munmap(bo->data, bo->size);
-	bo->data = NULL;
+	if (bo->data) {
+		munmap(bo->data, bo->size);
+		bo->data = NULL;
+	}
 }
 
 struct radeon_bo *radeon_bo(struct radeon *radeon, unsigned handle,




More information about the mesa-commit mailing list