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

Commit 4d4c00d4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: stat: Share common code for buffer allocation 



Move code common between the isp_stat_bufs_alloc_dma() and
isp_stat_bufs_alloc_iommu() functions to isp_stat_bufs_alloc().

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 51269860

drivers/media/platform/omap3isp/ispstat.c

+54 −60
Original line number Diff line number Diff line
@@ -389,74 +389,42 @@ static void isp_stat_bufs_free(struct ispstat *stat) 
	stat->active_buf = NULL;

}



static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)

static int isp_stat_bufs_alloc_iommu(struct ispstat *stat,

				     struct ispstat_buffer *buf,

				     unsigned int size)

{

	struct isp_device *isp = stat->isp;

	int i;



	stat->buf_alloc_size = size;



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

		struct ispstat_buffer *buf = &stat->buf[i];

	struct iovm_struct *iovm;



	buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->dev, 0,

						size, IOMMU_FLAG);

		if (IS_ERR((void *)buf->iommu_addr)) {

			dev_err(stat->isp->dev,

				 "%s: Can't acquire memory for "

				 "buffer %d\n", stat->subdev.name, i);

			isp_stat_bufs_free(stat);

	if (IS_ERR((void *)buf->iommu_addr))

		return -ENOMEM;

		}



	iovm = omap_find_iovm_area(isp->dev, buf->iommu_addr);

		if (!iovm ||

		    !dma_map_sg(isp->dev, iovm->sgt->sgl, iovm->sgt->nents,

				DMA_FROM_DEVICE)) {

			isp_stat_bufs_free(stat);

	if (!iovm)

		return -ENOMEM;



	if (!dma_map_sg(isp->dev, iovm->sgt->sgl, iovm->sgt->nents,

			DMA_FROM_DEVICE))

		return -ENOMEM;

		}

		buf->iovm = iovm;



	buf->iovm = iovm;

	buf->virt_addr = omap_da_to_va(stat->isp->dev,

				  (u32)buf->iommu_addr);

		buf->empty = 1;

		dev_dbg(stat->isp->dev, "%s: buffer[%d] allocated."

			"iommu_addr=0x%08lx virt_addr=0x%08lx",

			stat->subdev.name, i, buf->iommu_addr,

			(unsigned long)buf->virt_addr);

	}



	return 0;

}



static int isp_stat_bufs_alloc_dma(struct ispstat *stat, unsigned int size)

static int isp_stat_bufs_alloc_dma(struct ispstat *stat,

				   struct ispstat_buffer *buf,

				   unsigned int size)

{

	int i;



	stat->buf_alloc_size = size;



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

		struct ispstat_buffer *buf = &stat->buf[i];



	buf->virt_addr = dma_alloc_coherent(stat->isp->dev, size,

				&buf->dma_addr, GFP_KERNEL | GFP_DMA);



		if (!buf->virt_addr || !buf->dma_addr) {

			dev_info(stat->isp->dev,

				 "%s: Can't acquire memory for "

				 "DMA buffer %d\n", stat->subdev.name, i);

			isp_stat_bufs_free(stat);

	if (!buf->virt_addr || !buf->dma_addr)

		return -ENOMEM;

		}

		buf->empty = 1;



		dev_dbg(stat->isp->dev, "%s: buffer[%d] allocated."

			"dma_addr=0x%08lx virt_addr=0x%08lx\n",

			stat->subdev.name, i, (unsigned long)buf->dma_addr,

			(unsigned long)buf->virt_addr);

	}



	return 0;

}
@@ -464,6 +432,7 @@ static int isp_stat_bufs_alloc_dma(struct ispstat *stat, unsigned int size) 
static int isp_stat_bufs_alloc(struct ispstat *stat, u32 size)

{

	unsigned long flags;

	unsigned int i;



	spin_lock_irqsave(&stat->isp->stat_lock, flags);
@@ -487,10 +456,35 @@ static int isp_stat_bufs_alloc(struct ispstat *stat, u32 size) 


	isp_stat_bufs_free(stat);



	stat->buf_alloc_size = size;



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

		struct ispstat_buffer *buf = &stat->buf[i];

		int ret;



		if (ISP_STAT_USES_DMAENGINE(stat))

		return isp_stat_bufs_alloc_dma(stat, size);

			ret = isp_stat_bufs_alloc_dma(stat, buf, size);

		else

		return isp_stat_bufs_alloc_iommu(stat, size);

			ret = isp_stat_bufs_alloc_iommu(stat, buf, size);



		if (ret < 0) {

			dev_err(stat->isp->dev,

				"%s: Failed to allocate DMA buffer %u\n",

				stat->subdev.name, i);

			isp_stat_bufs_free(stat);

			return ret;

		}



		buf->empty = 1;



		dev_dbg(stat->isp->dev,

			"%s: buffer[%u] allocated. iommu=0x%08lx dma=0x%08lx virt=0x%08lx",

			stat->subdev.name, i, buf->iommu_addr,

			(unsigned long)buf->dma_addr,

			(unsigned long)buf->virt_addr);

	}



	return 0;

}



static void isp_stat_queue_event(struct ispstat *stat, int err)