From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Nov 2012 01:18:17 +0000 (+1100)
Subject: Merge remote-tracking branch 'drm/drm-next'
X-Git-Tag: next-20121113~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cf8995a8cb64658a7c6ce28ae50035b0020fbeb2;p=karo-tx-linux.git

Merge remote-tracking branch 'drm/drm-next'
---

cf8995a8cb64658a7c6ce28ae50035b0020fbeb2
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index d1498bfd7873,bd78257cba8b..f386cea75394
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
@@@ -304,9 -304,9 +304,9 @@@ void vmw_bo_pin(struct ttm_buffer_objec
  	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);
 +	       old_mem_type != VMW_PL_GMR);
  
  	pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED;
  	if (pin)