From: Vinson Lee <vlee@vmware.com>
Date: Sun, 25 Apr 2010 06:41:59 +0000 (-0700)
Subject: radeon: Remove NULL check of bo_legacy->tobj.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d69ed3a96eb4ed2630bee28f1937d376eee435e1;p=mesa.git

radeon: Remove NULL check of bo_legacy->tobj.

bo_legacy->tobj cannot be NULL before the call to driUpdateTextureLRU.
There is a NULL check earlier in the routine, and if bo_legacy->tobj is
NULL, memory is allocated.
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
index cf12664bacd..78f73bf99ce 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
@@ -618,8 +618,7 @@ static int bo_vram_validate(struct radeon_bo_int *bo,
 
     assert(bo_legacy->tobj->base.memBlock);
 
-    if (bo_legacy->tobj)
-	driUpdateTextureLRU(&bo_legacy->tobj->base);
+    driUpdateTextureLRU(&bo_legacy->tobj->base);
 
     if (bo_legacy->dirty || bo_legacy->tobj->base.dirty_images[0]) {
 	    if (IS_R600_CLASS(boml->screen)) {