diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2017-04-20 17:33:51 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2017-06-02 03:57:05 -0400 |
commit | 16869083b9bec8c1090442bd176a5b376708aba0 (patch) | |
tree | 828fc7af582c1f46e73f5c6e3611dc62ed8737aa /drivers/gpu/drm/omapdrm/omap_fbdev.c | |
parent | aa0408bcb1b8c2c5941b6e0e7ce0ad2b733bb971 (diff) |
drm: omapdrm: Rename occurrences of paddr to dma_addr
The fields, variables and functions deal with DMA addresses, name them
accordingly. The omap_gem_get_paddr() and omap_gem_put_paddr() will be
addressed differently separately.
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index d738e5b3ae45..dabb1affa2ca 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c | |||
@@ -106,7 +106,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, | |||
106 | union omap_gem_size gsize; | 106 | union omap_gem_size gsize; |
107 | struct fb_info *fbi = NULL; | 107 | struct fb_info *fbi = NULL; |
108 | struct drm_mode_fb_cmd2 mode_cmd = {0}; | 108 | struct drm_mode_fb_cmd2 mode_cmd = {0}; |
109 | dma_addr_t paddr; | 109 | dma_addr_t dma_addr; |
110 | int ret; | 110 | int ret; |
111 | 111 | ||
112 | sizes->surface_bpp = 32; | 112 | sizes->surface_bpp = 32; |
@@ -162,7 +162,7 @@ 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, &paddr); | 165 | ret = omap_gem_get_paddr(fbdev->bo, &dma_addr); |
166 | if (ret) { | 166 | if (ret) { |
167 | dev_err(dev->dev, | 167 | dev_err(dev->dev, |
168 | "could not map (paddr)! Skipping framebuffer alloc\n"); | 168 | "could not map (paddr)! Skipping framebuffer alloc\n"); |
@@ -193,11 +193,11 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, | |||
193 | drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); | 193 | drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); |
194 | drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height); | 194 | drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height); |
195 | 195 | ||
196 | dev->mode_config.fb_base = paddr; | 196 | dev->mode_config.fb_base = dma_addr; |
197 | 197 | ||
198 | fbi->screen_base = omap_gem_vaddr(fbdev->bo); | 198 | fbi->screen_base = omap_gem_vaddr(fbdev->bo); |
199 | fbi->screen_size = fbdev->bo->size; | 199 | fbi->screen_size = fbdev->bo->size; |
200 | fbi->fix.smem_start = paddr; | 200 | fbi->fix.smem_start = dma_addr; |
201 | fbi->fix.smem_len = fbdev->bo->size; | 201 | fbi->fix.smem_len = fbdev->bo->size; |
202 | 202 | ||
203 | /* if we have DMM, then we can use it for scrolling by just | 203 | /* if we have DMM, then we can use it for scrolling by just |