[media] s5p-mfc: Use preallocated block allocator always for MFC v6+

It turned out that all versions of MFC v6+ hardware doesn't have a strict
requirement for ALL buffers to be allocated on higher addresses than the
firmware base like it was documented for MFC v5. This requirement is true
only for the device and per-context buffers. All video data buffers can be
allocated anywhere for all MFC v6+ versions. Basing on this fact, the
special DMA configuration based on two reserved memory regions is not
really needed for MFC v6+ devices, because the memory requirements for the
firmware, device and per-context buffers can be fulfilled by the simple
probe-time pre-allocated block allocator introduced in previous patch.

This patch enables support for such pre-allocated block based allocator
always for MFC v6+ devices. Due to the limitations of the memory management
subsystem the largest supported size of the pre-allocated buffer when no
CMA (Contiguous Memory Allocator) is enabled is 4 MiB.

This patch also removes the requirement to provide two reserved memory
regions for MFC v6+ devices in device tree. Now the driver is fully
functional without them.

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/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index 2c901286d8185a0999a4ef6097bc79f905eab748..d3404b5d4d1795034342ae8640c5d9f9648591ae 100644 (file)
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -28,7 +28,7 @@ Optional properties:
   - memory-region : from reserved memory binding: phandles to two reserved
        memory regions, first is for "left" mfc memory bus interfaces,
        second if for the "right" mfc memory bus, used when no SYSMMU
-       support is available
+       support is available; used only by MFC v5 present in Exynos4 SoCs
 
 Obsolete properties:
   - samsung,mfc-r, samsung,mfc-l : support removed, please use memory-region

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index e6a81aa50c8e07c25d782220c9704ec9268e5ab3..50967ba8f018c59c64ecc1046ed4dbc63901e536 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1177,9 +1177,12 @@ static void s5p_mfc_unconfigure_2port_memory(struct s5p_mfc_dev *mfc_dev)
 static int s5p_mfc_configure_common_memory(struct s5p_mfc_dev *mfc_dev)
 {
        struct device *dev = &mfc_dev->plat_dev->dev;
-       unsigned long mem_size = SZ_8M;
+       unsigned long mem_size = SZ_4M;
        unsigned int bitmap_size;
 
+       if (IS_ENABLED(CONFIG_DMA_CMA) || exynos_is_iommu_available(dev))
+               mem_size = SZ_8M;
+
        if (mfc_mem_size)
                mem_size = memparse(mfc_mem_size, NULL);
 
@@ -1239,7 +1242,7 @@ static int s5p_mfc_configure_dma_memory(struct s5p_mfc_dev *mfc_dev)
 {
        struct device *dev = &mfc_dev->plat_dev->dev;
 
-       if (exynos_is_iommu_available(dev))
+       if (exynos_is_iommu_available(dev) || !IS_TWOPORT(mfc_dev))
                return s5p_mfc_configure_common_memory(mfc_dev);
        else
                return s5p_mfc_configure_2port_memory(mfc_dev);
@@ -1250,7 +1253,7 @@ static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev)
        struct device *dev = &mfc_dev->plat_dev->dev;
 
        s5p_mfc_release_firmware(mfc_dev);
-       if (exynos_is_iommu_available(dev))
+       if (exynos_is_iommu_available(dev) || !IS_TWOPORT(mfc_dev))
                s5p_mfc_unconfigure_common_memory(mfc_dev);
        else
                s5p_mfc_unconfigure_2port_memory(mfc_dev);