aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_fb.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_fb.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_fb.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_fb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 444bf92c5252..2e8d77166e1f 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -259,7 +259,7 @@ int omap_framebuffer_pin(struct drm_framebuffer *fb)
259 259
260 for (i = 0; i < n; i++) { 260 for (i = 0; i < n; i++) {
261 struct plane *plane = &omap_fb->planes[i]; 261 struct plane *plane = &omap_fb->planes[i];
262 ret = omap_gem_get_paddr(plane->bo, &plane->dma_addr); 262 ret = omap_gem_pin(plane->bo, &plane->dma_addr);
263 if (ret) 263 if (ret)
264 goto fail; 264 goto fail;
265 omap_gem_dma_sync(plane->bo, DMA_TO_DEVICE); 265 omap_gem_dma_sync(plane->bo, DMA_TO_DEVICE);
@@ -274,7 +274,7 @@ int omap_framebuffer_pin(struct drm_framebuffer *fb)
274fail: 274fail:
275 for (i--; i >= 0; i--) { 275 for (i--; i >= 0; i--) {
276 struct plane *plane = &omap_fb->planes[i]; 276 struct plane *plane = &omap_fb->planes[i];
277 omap_gem_put_paddr(plane->bo); 277 omap_gem_unpin(plane->bo);
278 plane->dma_addr = 0; 278 plane->dma_addr = 0;
279 } 279 }
280 280
@@ -300,7 +300,7 @@ void omap_framebuffer_unpin(struct drm_framebuffer *fb)
300 300
301 for (i = 0; i < n; i++) { 301 for (i = 0; i < n; i++) {
302 struct plane *plane = &omap_fb->planes[i]; 302 struct plane *plane = &omap_fb->planes[i];
303 omap_gem_put_paddr(plane->bo); 303 omap_gem_unpin(plane->bo);
304 plane->dma_addr = 0; 304 plane->dma_addr = 0;
305 } 305 }
306 306