From 71e95c2cc3da1a79705f57b2f4ae57d7b4cf04bf Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 29 Apr 2010 18:37:59 +1000 Subject: [PATCH] --- yaml --- r: 196531 b: refs/heads/master c: f4b7fb94c576265ceffc43031805ade32fa80c6a h: refs/heads/master i: 196529: 54148bff1f61c9f939514d7f242a1e76ed349328 196527: c083176afbb55536a67db58d8e00d31f3520a200 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_object.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8b8282b3cb0a..d051c4dd4736 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 539d24181753e40174746d576d415bfb56131975 +refs/heads/master: f4b7fb94c576265ceffc43031805ade32fa80c6a diff --git a/trunk/drivers/gpu/drm/radeon/radeon_object.c b/trunk/drivers/gpu/drm/radeon/radeon_object.c index 06def708b014..a8d18bcae7db 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_object.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_object.c @@ -168,13 +168,15 @@ void radeon_bo_kunmap(struct radeon_bo *bo) void radeon_bo_unref(struct radeon_bo **bo) { struct ttm_buffer_object *tbo; + struct radeon_device *rdev; if ((*bo) == NULL) return; + rdev = (*bo)->rdev; tbo = &((*bo)->tbo); - mutex_lock(&(*bo)->rdev->vram_mutex); + mutex_lock(&rdev->vram_mutex); ttm_bo_unref(&tbo); - mutex_unlock(&(*bo)->rdev->vram_mutex); + mutex_unlock(&rdev->vram_mutex); if (tbo == NULL) *bo = NULL; }