Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / vboxvideo / vbox_ttm.c

diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c
index 30f2700..9d78438 100644 (file)
--- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c
@@ -156,7 +156,7 @@ int vbox_mm_init(struct vbox_private *vbox)
        ret = ttm_bo_device_init(&vbox->ttm.bdev,
                                 &vbox_bo_driver,
                                 dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET, true);
+                                true);
        if (ret) {
                DRM_ERROR("Error initialising bo driver; %d\n", ret);
                return ret;
@@ -357,14 +357,8 @@ int vbox_bo_push_sysram(struct vbox_bo *bo)
 
 int vbox_mmap(struct file *filp, struct vm_area_struct *vma)
 {
-       struct drm_file *file_priv;
-       struct vbox_private *vbox;
-
-       if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
-               return -EINVAL;
-
-       file_priv = filp->private_data;
-       vbox = file_priv->minor->dev->dev_private;
+       struct drm_file *file_priv = filp->private_data;
+       struct vbox_private *vbox = file_priv->minor->dev->dev_private;
 
        return ttm_bo_mmap(filp, vma, &vbox->ttm.bdev);
 }