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

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
...@@ -188,8 +188,7 @@ int omap_gem_roll(struct drm_gem_object *obj, uint32_t roll); ...@@ -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_cpu_sync(struct drm_gem_object *obj, int pgoff);
void omap_gem_dma_sync(struct drm_gem_object *obj, void omap_gem_dma_sync(struct drm_gem_object *obj,
enum dma_data_direction dir); enum dma_data_direction dir);
int omap_gem_get_paddr(struct drm_gem_object *obj, int omap_gem_get_paddr(struct drm_gem_object *obj, dma_addr_t *paddr);
dma_addr_t *paddr, bool remap);
void omap_gem_put_paddr(struct drm_gem_object *obj); void omap_gem_put_paddr(struct drm_gem_object *obj);
int omap_gem_get_pages(struct drm_gem_object *obj, struct page ***pages, int omap_gem_get_pages(struct drm_gem_object *obj, struct page ***pages,
bool remap); bool remap);
......
...@@ -258,7 +258,7 @@ int omap_framebuffer_pin(struct drm_framebuffer *fb) ...@@ -258,7 +258,7 @@ int omap_framebuffer_pin(struct drm_framebuffer *fb)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
struct plane *plane = &omap_fb->planes[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) if (ret)
goto fail; goto fail;
omap_gem_dma_sync(plane->bo, DMA_TO_DEVICE); omap_gem_dma_sync(plane->bo, DMA_TO_DEVICE);
......
...@@ -162,7 +162,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, ...@@ -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- * to it). Then we just need to be sure that we are able to re-
* pin it in case of an opps. * 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) { if (ret) {
dev_err(dev->dev, dev_err(dev->dev,
"could not map (paddr)! Skipping framebuffer alloc\n"); "could not map (paddr)! Skipping framebuffer alloc\n");
......
...@@ -784,12 +784,10 @@ void omap_gem_dma_sync(struct drm_gem_object *obj, ...@@ -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 /* Get physical address for DMA.. if the buffer is not already contiguous, remap
* already contiguous, remap it to pin in physically contiguous memory.. (ie. * it to pin in physically contiguous memory.. (ie. map in TILER)
* map in TILER)
*/ */
int omap_gem_get_paddr(struct drm_gem_object *obj, int omap_gem_get_paddr(struct drm_gem_object *obj, dma_addr_t *paddr)
dma_addr_t *paddr, bool remap)
{ {
struct omap_drm_private *priv = obj->dev->dev_private; struct omap_drm_private *priv = obj->dev->dev_private;
struct omap_gem_object *omap_obj = to_omap_bo(obj); struct omap_gem_object *omap_obj = to_omap_bo(obj);
...@@ -797,7 +795,7 @@ int omap_gem_get_paddr(struct drm_gem_object *obj, ...@@ -797,7 +795,7 @@ int omap_gem_get_paddr(struct drm_gem_object *obj,
mutex_lock(&obj->dev->struct_mutex); 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) { if (omap_obj->paddr_cnt == 0) {
struct page **pages; struct page **pages;
uint32_t npages = obj->size >> PAGE_SHIFT; uint32_t npages = obj->size >> PAGE_SHIFT;
......
...@@ -41,7 +41,7 @@ static struct sg_table *omap_gem_map_dma_buf( ...@@ -41,7 +41,7 @@ static struct sg_table *omap_gem_map_dma_buf(
/* camera, etc, need physically contiguous.. but we need a /* camera, etc, need physically contiguous.. but we need a
* better way to know this.. * better way to know this..
*/ */
ret = omap_gem_get_paddr(obj, &paddr, true); ret = omap_gem_get_paddr(obj, &paddr);
if (ret) if (ret)
goto out; goto out;
......
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