diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2017-04-20 17:33:55 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2017-06-02 03:57:06 -0400 |
commit | d61ce7da02a3c52317474f2a15dd610ec652d513 (patch) | |
tree | 6d636eaea8b31258d17ad93df135b9321b508da8 /drivers/gpu/drm/omapdrm/omap_gem.c | |
parent | 57c22f7cc24ab6284d23d370929f2d452bb79729 (diff) |
drm: omapdrm: Rename GEM DMA sync functions
The omap_gem_cpu_sync() function operates at a page level, while the
omap_gem_dma_sync() function operates at a buffer level. Rename them to
omap_gem_cpu_sync_page() and omap_gem_dma_sync_buffer() respectively to
avoid confusion.
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_gem.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 6a5a4d07f675..86567e591f4e 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c | |||
@@ -388,7 +388,7 @@ static int fault_1d(struct drm_gem_object *obj, | |||
388 | pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; | 388 | pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; |
389 | 389 | ||
390 | if (omap_obj->pages) { | 390 | if (omap_obj->pages) { |
391 | omap_gem_cpu_sync(obj, pgoff); | 391 | omap_gem_cpu_sync_page(obj, pgoff); |
392 | pfn = page_to_pfn(omap_obj->pages[pgoff]); | 392 | pfn = page_to_pfn(omap_obj->pages[pgoff]); |
393 | } else { | 393 | } else { |
394 | BUG_ON(!is_contiguous(omap_obj)); | 394 | BUG_ON(!is_contiguous(omap_obj)); |
@@ -734,7 +734,7 @@ static inline bool is_cached_coherent(struct drm_gem_object *obj) | |||
734 | /* Sync the buffer for CPU access.. note pages should already be | 734 | /* Sync the buffer for CPU access.. note pages should already be |
735 | * attached, ie. omap_gem_get_pages() | 735 | * attached, ie. omap_gem_get_pages() |
736 | */ | 736 | */ |
737 | void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff) | 737 | void omap_gem_cpu_sync_page(struct drm_gem_object *obj, int pgoff) |
738 | { | 738 | { |
739 | struct drm_device *dev = obj->dev; | 739 | struct drm_device *dev = obj->dev; |
740 | struct omap_gem_object *omap_obj = to_omap_bo(obj); | 740 | struct omap_gem_object *omap_obj = to_omap_bo(obj); |
@@ -747,7 +747,7 @@ void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff) | |||
747 | } | 747 | } |
748 | 748 | ||
749 | /* sync the buffer for DMA access */ | 749 | /* sync the buffer for DMA access */ |
750 | void omap_gem_dma_sync(struct drm_gem_object *obj, | 750 | void omap_gem_dma_sync_buffer(struct drm_gem_object *obj, |
751 | enum dma_data_direction dir) | 751 | enum dma_data_direction dir) |
752 | { | 752 | { |
753 | struct drm_device *dev = obj->dev; | 753 | struct drm_device *dev = obj->dev; |