Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d61ce7da authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 57c22f7c

drivers/gpu/drm/omapdrm/omap_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ int omap_gem_mmap_obj(struct drm_gem_object *obj, 
		struct vm_area_struct *vma);

int omap_gem_fault(struct vm_fault *vmf);

int omap_gem_roll(struct drm_gem_object *obj, uint32_t roll);

void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff);

void omap_gem_dma_sync(struct drm_gem_object *obj,

void omap_gem_cpu_sync_page(struct drm_gem_object *obj, int pgoff);

void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,

		enum dma_data_direction dir);

int omap_gem_pin(struct drm_gem_object *obj, dma_addr_t *dma_addr);

void omap_gem_unpin(struct drm_gem_object *obj);

drivers/gpu/drm/omapdrm/omap_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ int omap_framebuffer_pin(struct drm_framebuffer *fb) 
		ret = omap_gem_pin(plane->bo, &plane->dma_addr);

		if (ret)

			goto fail;

		omap_gem_dma_sync(plane->bo, DMA_TO_DEVICE);

		omap_gem_dma_sync_buffer(plane->bo, DMA_TO_DEVICE);

	}



	omap_fb->pin_count++;

drivers/gpu/drm/omapdrm/omap_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static int fault_1d(struct drm_gem_object *obj, 
	pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;



	if (omap_obj->pages) {

		omap_gem_cpu_sync(obj, pgoff);

		omap_gem_cpu_sync_page(obj, pgoff);

		pfn = page_to_pfn(omap_obj->pages[pgoff]);

	} else {

		BUG_ON(!is_contiguous(omap_obj));
@@ -734,7 +734,7 @@ static inline bool is_cached_coherent(struct drm_gem_object *obj) 
/* Sync the buffer for CPU access.. note pages should already be

 * attached, ie. omap_gem_get_pages()

 */

void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff)

void omap_gem_cpu_sync_page(struct drm_gem_object *obj, int pgoff)

{

	struct drm_device *dev = obj->dev;

	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) 
}



/* sync the buffer for DMA access */

void omap_gem_dma_sync(struct drm_gem_object *obj,

void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,

		enum dma_data_direction dir)

{

	struct drm_device *dev = obj->dev;

drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static struct sg_table *omap_gem_map_dma_buf( 
	sg_dma_address(sg->sgl) = dma_addr;



	/* this must be after omap_gem_pin() to ensure we have pages attached */

	omap_gem_dma_sync(obj, dir);

	omap_gem_dma_sync_buffer(obj, dir);



	return sg;

out:
@@ -112,7 +112,7 @@ static void *omap_gem_dmabuf_kmap_atomic(struct dma_buf *buffer, 
	struct drm_gem_object *obj = buffer->priv;

	struct page **pages;

	omap_gem_get_pages(obj, &pages, false);

	omap_gem_cpu_sync(obj, page_num);

	omap_gem_cpu_sync_page(obj, page_num);

	return kmap_atomic(pages[page_num]);

}
@@ -128,7 +128,7 @@ static void *omap_gem_dmabuf_kmap(struct dma_buf *buffer, 
	struct drm_gem_object *obj = buffer->priv;

	struct page **pages;

	omap_gem_get_pages(obj, &pages, false);

	omap_gem_cpu_sync(obj, page_num);

	omap_gem_cpu_sync_page(obj, page_num);

	return kmap(pages[page_num]);

}