Commit 255d831d authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Replace mem_dev_* entries with an array 



Internal MFC driver device structure contains two pointers to devices used
for DMA memory allocation: mem_dev_l and mem_dev_r. Replace them with the
mem_dev[] array and use defines for accessing particular banks. This will
help to simplify code in the next patches.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Tested-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Tested-by: default avatarSmitha T Murthy <smitha.t@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 4a5ab64c

drivers/media/platform/s5p-mfc/s5p_mfc.c

+17 −14
Original line number Diff line number Diff line
@@ -1118,7 +1118,8 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) 
		int ret = exynos_configure_iommu(dev, S5P_MFC_IOMMU_DMA_BASE,

						 S5P_MFC_IOMMU_DMA_SIZE);

		if (ret == 0)

			mfc_dev->mem_dev_l = mfc_dev->mem_dev_r = dev;

			mfc_dev->mem_dev[BANK1_CTX] =

				mfc_dev->mem_dev[BANK2_CTX] = dev;

		return ret;

	}
@@ -1126,14 +1127,14 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev) 
	 * Create and initialize virtual devices for accessing

	 * reserved memory regions.

	 */

	mfc_dev->mem_dev_l = s5p_mfc_alloc_memdev(dev, "left",

						  MFC_BANK1_ALLOC_CTX);

	if (!mfc_dev->mem_dev_l)

	mfc_dev->mem_dev[BANK1_CTX] = s5p_mfc_alloc_memdev(dev, "left",

							   BANK1_CTX);

	if (!mfc_dev->mem_dev[BANK1_CTX])

		return -ENODEV;

	mfc_dev->mem_dev_r = s5p_mfc_alloc_memdev(dev, "right",

						  MFC_BANK2_ALLOC_CTX);

	if (!mfc_dev->mem_dev_r) {

		device_unregister(mfc_dev->mem_dev_l);

	mfc_dev->mem_dev[BANK2_CTX] = s5p_mfc_alloc_memdev(dev, "right",

							   BANK2_CTX);

	if (!mfc_dev->mem_dev[BANK2_CTX]) {

		device_unregister(mfc_dev->mem_dev[BANK1_CTX]);

		return -ENODEV;

	}
@@ -1149,8 +1150,8 @@ static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev) 
		return;

	}



	device_unregister(mfc_dev->mem_dev_l);

	device_unregister(mfc_dev->mem_dev_r);

	device_unregister(mfc_dev->mem_dev[BANK1_CTX]);

	device_unregister(mfc_dev->mem_dev[BANK2_CTX]);

}



/* MFC probe function */
@@ -1208,8 +1209,10 @@ static int s5p_mfc_probe(struct platform_device *pdev) 
		goto err_dma;

	}



	vb2_dma_contig_set_max_seg_size(dev->mem_dev_l, DMA_BIT_MASK(32));

	vb2_dma_contig_set_max_seg_size(dev->mem_dev_r, DMA_BIT_MASK(32));

	vb2_dma_contig_set_max_seg_size(dev->mem_dev[BANK1_CTX],

					DMA_BIT_MASK(32));

	vb2_dma_contig_set_max_seg_size(dev->mem_dev[BANK2_CTX],

					DMA_BIT_MASK(32));



	mutex_init(&dev->mfc_mutex);

	init_waitqueue_head(&dev->queue);
@@ -1343,8 +1346,8 @@ static int s5p_mfc_remove(struct platform_device *pdev) 
	v4l2_device_unregister(&dev->v4l2_dev);

	s5p_mfc_release_firmware(dev);

	s5p_mfc_unconfigure_dma_memory(dev);

	vb2_dma_contig_clear_max_seg_size(dev->mem_dev_l);

	vb2_dma_contig_clear_max_seg_size(dev->mem_dev_r);

	vb2_dma_contig_clear_max_seg_size(dev->mem_dev[BANK1_CTX]);

	vb2_dma_contig_clear_max_seg_size(dev->mem_dev[BANK2_CTX]);



	s5p_mfc_final_pm(dev);

	return 0;

drivers/media/platform/s5p-mfc/s5p_mfc_common.h

+5 −6
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ 
*  while mmaping */

#define DST_QUEUE_OFF_BASE	(1 << 30)



#define MFC_BANK1_ALLOC_CTX	0

#define MFC_BANK2_ALLOC_CTX	1

#define BANK1_CTX	0

#define BANK2_CTX	1

#define BANK_CTX_NUM	2



#define MFC_BANK1_ALIGN_ORDER	13

#define MFC_BANK2_ALIGN_ORDER	13
@@ -254,8 +255,7 @@ struct s5p_mfc_priv_buf { 
 * @vfd_dec:		video device for decoding

 * @vfd_enc:		video device for encoding

 * @plat_dev:		platform device

 * @mem_dev_l:		child device of the left memory bank (0)

 * @mem_dev_r:		child device of the right memory bank (1)

 * @mem_dev[]:		child devices of the memory banks

 * @regs_base:		base address of the MFC hw registers

 * @irq:		irq resource

 * @dec_ctrl_handler:	control framework handler for decoding
@@ -297,8 +297,7 @@ struct s5p_mfc_dev { 
	struct video_device	*vfd_dec;

	struct video_device	*vfd_enc;

	struct platform_device	*plat_dev;

	struct device		*mem_dev_l;

	struct device		*mem_dev_r;

	struct device		*mem_dev[BANK_CTX_NUM];

	void __iomem		*regs_base;

	int			irq;

	struct v4l2_ctrl_handler dec_ctrl_handler;

drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c

+12 −11
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev) 
{

	void *bank2_virt;

	dma_addr_t bank2_dma_addr;

	unsigned int align_size = 1 << MFC_BASE_ALIGN_ORDER;



	dev->fw_size = dev->variant->buf_size->fw;
@@ -36,8 +37,8 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev) 
		return -ENOMEM;

	}



	dev->fw_virt_addr = dma_alloc_coherent(dev->mem_dev_l, dev->fw_size,

					&dev->bank1, GFP_KERNEL);

	dev->fw_virt_addr = dma_alloc_coherent(dev->mem_dev[BANK1_CTX],

					dev->fw_size, &dev->bank1, GFP_KERNEL);



	if (!dev->fw_virt_addr) {

		mfc_err("Allocating bitprocessor buffer failed\n");
@@ -45,12 +46,12 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev) 
	}



	if (HAS_PORTNUM(dev) && IS_TWOPORT(dev)) {

		bank2_virt = dma_alloc_coherent(dev->mem_dev_r, 1 << MFC_BASE_ALIGN_ORDER,

					&bank2_dma_addr, GFP_KERNEL);

		bank2_virt = dma_alloc_coherent(dev->mem_dev[BANK2_CTX],

				       align_size, &bank2_dma_addr, GFP_KERNEL);



		if (!bank2_virt) {

			mfc_err("Allocating bank2 base failed\n");

			dma_free_coherent(dev->mem_dev_l, dev->fw_size,

			dma_free_coherent(dev->mem_dev[BANK1_CTX], dev->fw_size,

					  dev->fw_virt_addr, dev->bank1);

			dev->fw_virt_addr = NULL;

			return -ENOMEM;
@@ -60,9 +61,9 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev) 
		 * should not have address of bank2 - MFC will treat it as a null frame.

		 * To avoid such situation we set bank2 address below the pool address.

		 */

		dev->bank2 = bank2_dma_addr - (1 << MFC_BASE_ALIGN_ORDER);

		dev->bank2 = bank2_dma_addr - align_size;



		dma_free_coherent(dev->mem_dev_r, 1 << MFC_BASE_ALIGN_ORDER,

		dma_free_coherent(dev->mem_dev[BANK2_CTX], align_size,

				  bank2_virt, bank2_dma_addr);



	} else {
@@ -123,8 +124,8 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev) 
	 * that MFC is no longer processing */

	if (!dev->fw_virt_addr)

		return -EINVAL;

	dma_free_coherent(dev->mem_dev_l, dev->fw_size, dev->fw_virt_addr,

						dev->bank1);

	dma_free_coherent(dev->mem_dev[BANK1_CTX], dev->fw_size,

			  dev->fw_virt_addr, dev->bank1);

	dev->fw_virt_addr = NULL;

	return 0;

}

drivers/media/platform/s5p-mfc/s5p_mfc_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -931,14 +931,14 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq, 
		psize[1] = ctx->chroma_size;



		if (IS_MFCV6_PLUS(dev))

			alloc_devs[0] = ctx->dev->mem_dev_l;

			alloc_devs[0] = ctx->dev->mem_dev[BANK1_CTX];

		else

			alloc_devs[0] = ctx->dev->mem_dev_r;

		alloc_devs[1] = ctx->dev->mem_dev_l;

			alloc_devs[0] = ctx->dev->mem_dev[BANK2_CTX];

		alloc_devs[1] = ctx->dev->mem_dev[BANK1_CTX];

	} else if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &&

		   ctx->state == MFCINST_INIT) {

		psize[0] = ctx->dec_src_buf_size;

		alloc_devs[0] = ctx->dev->mem_dev_l;

		alloc_devs[0] = ctx->dev->mem_dev[BANK1_CTX];

	} else {

		mfc_err("This video node is dedicated to decoding. Decoding not initialized\n");

		return -EINVAL;

drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

+5 −5
Original line number Diff line number Diff line
@@ -1832,7 +1832,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq, 
		if (*buf_count > MFC_MAX_BUFFERS)

			*buf_count = MFC_MAX_BUFFERS;

		psize[0] = ctx->enc_dst_buf_size;

		alloc_devs[0] = ctx->dev->mem_dev_l;

		alloc_devs[0] = ctx->dev->mem_dev[BANK1_CTX];

	} else if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {

		if (ctx->src_fmt)

			*plane_count = ctx->src_fmt->num_planes;
@@ -1848,11 +1848,11 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq, 
		psize[1] = ctx->chroma_size;



		if (IS_MFCV6_PLUS(dev)) {

			alloc_devs[0] = ctx->dev->mem_dev_l;

			alloc_devs[1] = ctx->dev->mem_dev_l;

			alloc_devs[0] = ctx->dev->mem_dev[BANK1_CTX];

			alloc_devs[1] = ctx->dev->mem_dev[BANK1_CTX];

		} else {

			alloc_devs[0] = ctx->dev->mem_dev_r;

			alloc_devs[1] = ctx->dev->mem_dev_r;

			alloc_devs[0] = ctx->dev->mem_dev[BANK2_CTX];

			alloc_devs[1] = ctx->dev->mem_dev[BANK2_CTX];

		}

	} else {

		mfc_err("invalid queue type: %d\n", vq->type);