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

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

drm: omapdrm: Remove remap argument to omap_gem_get_paddr() 



The function is always called with the remap argument set to true.
Hardcode that behaviour and remove it.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent dff6c246

drivers/gpu/drm/omapdrm/omap_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ 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,

		enum dma_data_direction dir);

int omap_gem_get_paddr(struct drm_gem_object *obj,

		dma_addr_t *paddr, bool remap);

int omap_gem_get_paddr(struct drm_gem_object *obj, dma_addr_t *paddr);

void omap_gem_put_paddr(struct drm_gem_object *obj);

int omap_gem_get_pages(struct drm_gem_object *obj, struct page ***pages,

		bool remap);

drivers/gpu/drm/omapdrm/omap_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int omap_framebuffer_pin(struct drm_framebuffer *fb) 


	for (i = 0; i < n; i++) {

		struct plane *plane = &omap_fb->planes[i];

		ret = omap_gem_get_paddr(plane->bo, &plane->paddr, true);

		ret = omap_gem_get_paddr(plane->bo, &plane->paddr);

		if (ret)

			goto fail;

		omap_gem_dma_sync(plane->bo, DMA_TO_DEVICE);

drivers/gpu/drm/omapdrm/omap_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, 
	 * to it).  Then we just need to be sure that we are able to re-

	 * pin it in case of an opps.

	 */

	ret = omap_gem_get_paddr(fbdev->bo, &paddr, true);

	ret = omap_gem_get_paddr(fbdev->bo, &paddr);

	if (ret) {

		dev_err(dev->dev,

			"could not map (paddr)!  Skipping framebuffer alloc\n");

drivers/gpu/drm/omapdrm/omap_gem.c

+4 −6
Original line number Diff line number Diff line
@@ -784,12 +784,10 @@ void omap_gem_dma_sync(struct drm_gem_object *obj, 
	}

}



/* Get physical address for DMA.. if 'remap' is true, and the buffer is not

 * already contiguous, remap it to pin in physically contiguous memory.. (ie.

 * map in TILER)

/* Get physical address for DMA.. if the buffer is not already contiguous, remap

 * it to pin in physically contiguous memory.. (ie. map in TILER)

 */

int omap_gem_get_paddr(struct drm_gem_object *obj,

		dma_addr_t *paddr, bool remap)

int omap_gem_get_paddr(struct drm_gem_object *obj, dma_addr_t *paddr)

{

	struct omap_drm_private *priv = obj->dev->dev_private;

	struct omap_gem_object *omap_obj = to_omap_bo(obj);
@@ -797,7 +795,7 @@ int omap_gem_get_paddr(struct drm_gem_object *obj, 


	mutex_lock(&obj->dev->struct_mutex);



	if (!is_contiguous(omap_obj) && remap && priv->has_dmm) {

	if (!is_contiguous(omap_obj) && priv->has_dmm) {

		if (omap_obj->paddr_cnt == 0) {

			struct page **pages;

			uint32_t npages = obj->size >> PAGE_SHIFT;

drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct sg_table *omap_gem_map_dma_buf( 
	/* camera, etc, need physically contiguous.. but we need a

	 * better way to know this..

	 */

	ret = omap_gem_get_paddr(obj, &paddr, true);

	ret = omap_gem_get_paddr(obj, &paddr);

	if (ret)

		goto out;