---

yaml --- r: 345065 b: refs/heads/master c: 94baf0e h: refs/heads/master i: 345063: 86c4adc v: v3
git-mirror · Nov 7, 2012 · 97cd047 · 97cd047
1 parent e3ebd16
commit 97cd047
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a46fb5f41dbc7fae20764556ec7bf742cc0763a
+refs/heads/master: 94baf0e27181c6a2f82cdbc5b960b197570e17de
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
@@ -304,7 +304,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin)
 	uint32_t old_mem_type = bo->mem.mem_type;
 	int ret;
 
-	BUG_ON(!atomic_read(&bo->reserved));
+	BUG_ON(!ttm_bo_is_reserved(bo));
 	BUG_ON(old_mem_type != TTM_PL_VRAM &&
 	       old_mem_type != VMW_PL_FLAG_GMR);