[media] s5p-mfc: Move setting DMA max segment size to DMA configure function

Setting DMA max segment size to 32 bit mask is a part of DMA memory
configuration, so move those calls to s5p_mfc_configure_dma_memory()
function.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Andrzej Hajda <a.hajda@samsung.com>
Tested-by: Smitha T Murthy <smitha.t@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index c03ed1a737b711f294175d192cd9254f89d463da..1fe790d88e70634af609eb4f797e0bd4204934e7 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1117,9 +1117,13 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev)
        if (exynos_is_iommu_available(dev)) {
                int ret = exynos_configure_iommu(dev, S5P_MFC_IOMMU_DMA_BASE,
                                                 S5P_MFC_IOMMU_DMA_SIZE);
-               if (ret == 0)
+               if (ret == 0) {
                        mfc_dev->mem_dev[BANK1_CTX] =
                                mfc_dev->mem_dev[BANK2_CTX] = dev;
+                       vb2_dma_contig_set_max_seg_size(dev,
+                                                       DMA_BIT_MASK(32));
+               }
+
                return ret;
        }
 
@@ -1138,6 +1142,11 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev)
                return -ENODEV;
        }
 
+       vb2_dma_contig_set_max_seg_size(mfc_dev->mem_dev[BANK1_CTX],
+                                       DMA_BIT_MASK(32));
+       vb2_dma_contig_set_max_seg_size(mfc_dev->mem_dev[BANK2_CTX],
+                                       DMA_BIT_MASK(32));
+
        return 0;
 }
 
@@ -1147,11 +1156,14 @@ static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev)
 
        if (exynos_is_iommu_available(dev)) {
                exynos_unconfigure_iommu(dev);
+               vb2_dma_contig_clear_max_seg_size(dev);
                return;
        }
 
        device_unregister(mfc_dev->mem_dev[BANK1_CTX]);
        device_unregister(mfc_dev->mem_dev[BANK2_CTX]);
+       vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK1_CTX]);
+       vb2_dma_contig_clear_max_seg_size(mfc_dev->mem_dev[BANK2_CTX]);
 }
 
 /* MFC probe function */
@@ -1209,11 +1221,6 @@ static int s5p_mfc_probe(struct platform_device *pdev)
                goto err_dma;
        }
 
-       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);
        dev->hw_lock = 0;
@@ -1346,8 +1353,6 @@ 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[BANK1_CTX]);
-       vb2_dma_contig_clear_max_seg_size(dev->mem_dev[BANK2_CTX]);
 
        s5p_mfc_final_pm(dev);
        return 0;