aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_fbdev.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2017-04-20 17:33:52 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2017-06-02 03:57:05 -0400
commitbc20c85caba279b7c63146bab683ca1a81de9f79 (patch)
treefc775496c33f32ca4feabf120a19cdb710f78e89 /drivers/gpu/drm/omapdrm/omap_fbdev.c
parent16869083b9bec8c1090442bd176a5b376708aba0 (diff)
drm: omapdrm: Rename omap_gem_(get|put)_paddr() to omap_gem_(un)pin()
The reflects the purpose of the function better. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fbdev.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_fbdev.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index dabb1affa2ca..daf81a0a2899 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -162,10 +162,9 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
162 * to it). Then we just need to be sure that we are able to re- 162 * to it). Then we just need to be sure that we are able to re-
163 * pin it in case of an opps. 163 * pin it in case of an opps.
164 */ 164 */
165 ret = omap_gem_get_paddr(fbdev->bo, &dma_addr); 165 ret = omap_gem_pin(fbdev->bo, &dma_addr);
166 if (ret) { 166 if (ret) {
167 dev_err(dev->dev, 167 dev_err(dev->dev, "could not pin framebuffer\n");
168 "could not map (paddr)! Skipping framebuffer alloc\n");
169 ret = -ENOMEM; 168 ret = -ENOMEM;
170 goto fail; 169 goto fail;
171 } 170 }
@@ -303,8 +302,8 @@ void omap_fbdev_free(struct drm_device *dev)
303 302
304 fbdev = to_omap_fbdev(priv->fbdev); 303 fbdev = to_omap_fbdev(priv->fbdev);
305 304
306 /* release the ref taken in omap_fbdev_create() */ 305 /* unpin the GEM object pinned in omap_fbdev_create() */
307 omap_gem_put_paddr(fbdev->bo); 306 omap_gem_unpin(fbdev->bo);
308 307
309 /* this will free the backing object */ 308 /* this will free the backing object */
310 if (fbdev->fb) 309 if (fbdev->fb)