1 files changed, 11 insertions, 52 deletions

diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index ef034fa3e6f5..8dbe9d0ae9a7 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -66,12 +66,6 @@ int udl_dumb_create(struct drm_file *file,
                               args->size, &args->handle);
 }
 
-int udl_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                     uint32_t handle)
-{
-        return drm_gem_handle_delete(file, handle);
-}
-
 int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 {
         int ret;
@@ -123,55 +117,23 @@ int udl_gem_init_object(struct drm_gem_object *obj)
 
 static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask)
 {
-        int page_count, i;
-        struct page *page;
-        struct inode *inode;
-        struct address_space *mapping;
+        struct page **pages;
 
         if (obj->pages)
                 return 0;
 
-        page_count = obj->base.size / PAGE_SIZE;
-        BUG_ON(obj->pages != NULL);
-        obj->pages = drm_malloc_ab(page_count, sizeof(struct page *));
-        if (obj->pages == NULL)
-                return -ENOMEM;
+        pages = drm_gem_get_pages(&obj->base, gfpmask);
+        if (IS_ERR(pages))
+                return PTR_ERR(pages);
 
-        inode = file_inode(obj->base.filp);
-        mapping = inode->i_mapping;
-        gfpmask |= mapping_gfp_mask(mapping);
-
-        for (i = 0; i < page_count; i++) {
-                page = shmem_read_mapping_page_gfp(mapping, i, gfpmask);
-                if (IS_ERR(page))
-                        goto err_pages;
-                obj->pages[i] = page;
-        }
+        obj->pages = pages;
 
         return 0;
-err_pages:
-        while (i--)
-                page_cache_release(obj->pages[i]);
-        drm_free_large(obj->pages);
-        obj->pages = NULL;
-        return PTR_ERR(page);
 }
 
 static void udl_gem_put_pages(struct udl_gem_object *obj)
 {
-        int page_count = obj->base.size / PAGE_SIZE;
-        int i;
-
-        if (obj->base.import_attach) {
-                drm_free_large(obj->pages);
-                obj->pages = NULL;
-                return;
-        }
-
-        for (i = 0; i < page_count; i++)
-                page_cache_release(obj->pages[i]);
-
-        drm_free_large(obj->pages);
+        drm_gem_put_pages(&obj->base, obj->pages, false, false);
         obj->pages = NULL;
 }
 
@@ -223,8 +185,7 @@ void udl_gem_free_object(struct drm_gem_object *gem_obj)
         if (obj->pages)
                 udl_gem_put_pages(obj);
 
-        if (gem_obj->map_list.map)
-                drm_gem_free_mmap_offset(gem_obj);
+        drm_gem_free_mmap_offset(gem_obj);
 }
 
 /* the dumb interface doesn't work with the GEM straight MMAP
@@ -247,13 +208,11 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev,
         ret = udl_gem_get_pages(gobj, GFP_KERNEL);
         if (ret)
                 goto out;
-        if (!gobj->base.map_list.map) {
-                ret = drm_gem_create_mmap_offset(obj);
-                if (ret)
-                        goto out;
-        }
+        ret = drm_gem_create_mmap_offset(obj);
+        if (ret)
+                goto out;
 
-        *offset = (u64)gobj->base.map_list.hash.key << PAGE_SHIFT;
+        *offset = drm_vma_node_offset_addr(&gobj->base.vma_node);
 
 out:
         drm_gem_object_unreference(&gobj->base);