Commit 57c22f7c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen

drm: omapdrm: Rename the omap_gem_object addrs field to dma_addrs

The field contains DMA addresses, clarify that by renaming it.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 4fa6ce48
...@@ -95,7 +95,7 @@ struct omap_gem_object { ...@@ -95,7 +95,7 @@ struct omap_gem_object {
struct page **pages; struct page **pages;
/** addresses corresponding to pages in above array */ /** addresses corresponding to pages in above array */
dma_addr_t *addrs; dma_addr_t *dma_addrs;
/** /**
* Virtual address, if mapped. * Virtual address, if mapped.
...@@ -277,7 +277,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj) ...@@ -277,7 +277,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
} }
} }
omap_obj->addrs = addrs; omap_obj->dma_addrs = addrs;
omap_obj->pages = pages; omap_obj->pages = pages;
return 0; return 0;
...@@ -323,15 +323,15 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj) ...@@ -323,15 +323,15 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj)
if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) { if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) {
int i, npages = obj->size >> PAGE_SHIFT; int i, npages = obj->size >> PAGE_SHIFT;
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
if (omap_obj->addrs[i]) if (omap_obj->dma_addrs[i])
dma_unmap_page(obj->dev->dev, dma_unmap_page(obj->dev->dev,
omap_obj->addrs[i], omap_obj->dma_addrs[i],
PAGE_SIZE, DMA_BIDIRECTIONAL); PAGE_SIZE, DMA_BIDIRECTIONAL);
} }
} }
kfree(omap_obj->addrs); kfree(omap_obj->dma_addrs);
omap_obj->addrs = NULL; omap_obj->dma_addrs = NULL;
drm_gem_put_pages(obj, omap_obj->pages, true, false); drm_gem_put_pages(obj, omap_obj->pages, true, false);
omap_obj->pages = NULL; omap_obj->pages = NULL;
...@@ -739,10 +739,10 @@ void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff) ...@@ -739,10 +739,10 @@ void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff)
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
struct omap_gem_object *omap_obj = to_omap_bo(obj); struct omap_gem_object *omap_obj = to_omap_bo(obj);
if (is_cached_coherent(obj) && omap_obj->addrs[pgoff]) { if (is_cached_coherent(obj) && omap_obj->dma_addrs[pgoff]) {
dma_unmap_page(dev->dev, omap_obj->addrs[pgoff], dma_unmap_page(dev->dev, omap_obj->dma_addrs[pgoff],
PAGE_SIZE, DMA_BIDIRECTIONAL); PAGE_SIZE, DMA_BIDIRECTIONAL);
omap_obj->addrs[pgoff] = 0; omap_obj->dma_addrs[pgoff] = 0;
} }
} }
...@@ -760,7 +760,7 @@ void omap_gem_dma_sync(struct drm_gem_object *obj, ...@@ -760,7 +760,7 @@ void omap_gem_dma_sync(struct drm_gem_object *obj,
return; return;
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
if (!omap_obj->addrs[i]) { if (!omap_obj->dma_addrs[i]) {
dma_addr_t addr; dma_addr_t addr;
addr = dma_map_page(dev->dev, pages[i], 0, addr = dma_map_page(dev->dev, pages[i], 0,
...@@ -773,7 +773,7 @@ void omap_gem_dma_sync(struct drm_gem_object *obj, ...@@ -773,7 +773,7 @@ void omap_gem_dma_sync(struct drm_gem_object *obj,
} }
dirty = true; dirty = true;
omap_obj->addrs[i] = addr; omap_obj->dma_addrs[i] = addr;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment