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

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index d1498bfd78732ef519f50d6fea726d502cffd824,bd78257cba8bc9d2b47134c77f9fe9c51d2888f7..f386cea75394655a01bc9107c296ef352fd115ff
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
--- 2/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)