aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_gem.c
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2013-08-07 13:41:27 -0400
committerDave Airlie <airlied@redhat.com>2013-08-18 20:36:16 -0400
commitddcd09d62bd503bfd33291348b7cd8ad32d413fd (patch)
tree07680104fac373d348682c1c6b251d8929d3604a /drivers/gpu/drm/omapdrm/omap_gem.c
parent5dc9e1e87229cb786a5bb58ddd0d60fee6eb4641 (diff)
drm/omap: kill omap_gem_helpers.c
Signed-off-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_gem.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index b1f19702550f..533f6ebec531 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -237,7 +237,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
237 * mapping_gfp_mask(mapping) which conflicts w/ GFP_DMA32.. probably 237 * mapping_gfp_mask(mapping) which conflicts w/ GFP_DMA32.. probably
238 * we actually want CMA memory for it all anyways.. 238 * we actually want CMA memory for it all anyways..
239 */ 239 */
240 pages = _drm_gem_get_pages(obj, GFP_KERNEL); 240 pages = drm_gem_get_pages(obj, GFP_KERNEL);
241 if (IS_ERR(pages)) { 241 if (IS_ERR(pages)) {
242 dev_err(obj->dev->dev, "could not get pages: %ld\n", PTR_ERR(pages)); 242 dev_err(obj->dev->dev, "could not get pages: %ld\n", PTR_ERR(pages));
243 return PTR_ERR(pages); 243 return PTR_ERR(pages);
@@ -271,7 +271,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
271 return 0; 271 return 0;
272 272
273free_pages: 273free_pages:
274 _drm_gem_put_pages(obj, pages, true, false); 274 drm_gem_put_pages(obj, pages, true, false);
275 275
276 return ret; 276 return ret;
277} 277}
@@ -295,7 +295,7 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj)
295 kfree(omap_obj->addrs); 295 kfree(omap_obj->addrs);
296 omap_obj->addrs = NULL; 296 omap_obj->addrs = NULL;
297 297
298 _drm_gem_put_pages(obj, omap_obj->pages, true, false); 298 drm_gem_put_pages(obj, omap_obj->pages, true, false);
299 omap_obj->pages = NULL; 299 omap_obj->pages = NULL;
300} 300}
301 301
@@ -316,7 +316,7 @@ static uint64_t mmap_offset(struct drm_gem_object *obj)
316 316
317 /* Make it mmapable */ 317 /* Make it mmapable */
318 size = omap_gem_mmap_size(obj); 318 size = omap_gem_mmap_size(obj);
319 ret = _drm_gem_create_mmap_offset_size(obj, size); 319 ret = drm_gem_create_mmap_offset_size(obj, size);
320 if (ret) { 320 if (ret) {
321 dev_err(dev->dev, "could not allocate mmap offset\n"); 321 dev_err(dev->dev, "could not allocate mmap offset\n");
322 return 0; 322 return 0;