From 7c3b8ed87859bfdfb985d21685115a729f9cd138 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 12 Apr 2017 09:30:48 -0700 Subject: [PATCH] i965/drm: Delete NULL check in brw_bo_unmap(). I accidentally moved the bo->bufmgr dereference above the NULL check when cleaning up this code. While passing NULL to free() is a common pattern...passing NULL to unmap seems pretty bad. You really ought to know whether you have a buffer or not. We don't want to paper over bugs like that. So, just drop the NULL check altogether. CID: 1405006 Reviewed-by: Chris Wilson --- src/mesa/drivers/dri/i965/brw_bufmgr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c index 64f54498672..4b6433178d0 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.c +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c @@ -827,9 +827,6 @@ brw_bo_unmap(struct brw_bo *bo) struct brw_bufmgr *bufmgr = bo->bufmgr; int ret = 0; - if (bo == NULL) - return 0; - pthread_mutex_lock(&bufmgr->lock); if (bo->map_count <= 0) { -- 2.30.2