Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / gpu / drm / vmwgfx / vmwgfx_fb.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index a933670..7421aaa 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -559,8 +559,13 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
        info->pixmap.scan_align = 1;
 #endif
 
-       info->aperture_base = vmw_priv->vram_start;
-       info->aperture_size = vmw_priv->vram_size;
+       info->apertures = alloc_apertures(1);
+       if (!info->apertures) {
+               ret = -ENOMEM;
+               goto err_aper;
+       }
+       info->apertures->ranges[0].base = vmw_priv->vram_start;
+       info->apertures->ranges[0].size = vmw_priv->vram_size;
 
        /*
         * Dirty & Deferred IO
@@ -580,6 +585,7 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
 
 err_defio:
        fb_deferred_io_cleanup(info);
+err_aper:
        ttm_bo_kunmap(&par->map);
 err_unref:
        ttm_bo_unref((struct ttm_buffer_object **)&par->vmw_bo);
@@ -628,7 +634,7 @@ int vmw_dmabuf_from_vram(struct vmw_private *vmw_priv,
        if (unlikely(ret != 0))
                return ret;
 
-       ret = ttm_bo_validate(bo, &vmw_sys_placement, false, false);
+       ret = ttm_bo_validate(bo, &vmw_sys_placement, false, false, false);
        ttm_bo_unreserve(bo);
 
        return ret;
@@ -652,7 +658,7 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv,
        if (unlikely(ret != 0))
                goto err_unlock;
 
-       ret = ttm_bo_validate(bo, &ne_placement, false, false);
+       ret = ttm_bo_validate(bo, &ne_placement, false, false, false);
        ttm_bo_unreserve(bo);
 err_unlock:
        ttm_write_unlock(&vmw_priv->active_master->lock);