media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/
authorMauro Carvalho Chehab <mchehab@kernel.org>
Sun, 13 Mar 2022 10:18:13 +0000 (11:18 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 18 Mar 2022 04:56:51 +0000 (05:56 +0100)
As the end goal is to have platform drivers split by vendor,
rename mtk-mdp/ to mediatek/mtk-mdp/.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
29 files changed:
MAINTAINERS
drivers/media/platform/Kconfig
drivers/media/platform/Makefile
drivers/media/platform/mediatek/mtk-mdp/Kconfig [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/Makefile [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c [new file with mode: 0644]
drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h [new file with mode: 0644]
drivers/media/platform/mtk-mdp/Kconfig [deleted file]
drivers/media/platform/mtk-mdp/Makefile [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_comp.h [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_core.c [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_core.h [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_regs.c [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_regs.h [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c [deleted file]
drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h [deleted file]

index fa0a3de3865fd368b43e340102ab06bc5f214759..2203d98bbcf1b76a10c3230ef906f82a6c83270a 100644 (file)
@@ -12138,7 +12138,7 @@ M:      Houlong Wei <houlong.wei@mediatek.com>
 M:     Andrew-CT Chen <andrew-ct.chen@mediatek.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/media/mediatek-mdp.txt
-F:     drivers/media/platform/mtk-mdp/
+F:     drivers/media/platform/mediatek/mtk-mdp/
 F:     drivers/media/platform/mtk-vpu/
 
 MEDIATEK MEDIA DRIVER
index f1746529e7638d5433946aea4efb6ab849b5f560..8a7ac0b8e09f8250a7a28f163c9db714a43aa575 100644 (file)
@@ -79,7 +79,7 @@ source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/intel/Kconfig"
 source "drivers/media/platform/marvell/Kconfig"
 source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
-source "drivers/media/platform/mtk-mdp/Kconfig"
+source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
 source "drivers/media/platform/mtk-vcodec/Kconfig"
 source "drivers/media/platform/mtk-vpu/Kconfig"
 source "drivers/media/platform/nxp/Kconfig"
index c792f621691891347bee8539f8492c33713d31ed..6f5d09cd8f9beee16febf685972faf73d4dead5e 100644 (file)
@@ -19,7 +19,7 @@ obj-y += exynos4-is/
 obj-y += intel/
 obj-y += marvell/
 obj-y += mediatek/mtk-jpeg/
-obj-y += mtk-mdp/
+obj-y += mediatek/mtk-mdp/
 obj-y += mtk-vcodec/
 obj-y += mtk-vpu/
 obj-y += nxp/
diff --git a/drivers/media/platform/mediatek/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mtk-mdp/Kconfig
new file mode 100644 (file)
index 0000000..0cc7431
--- /dev/null
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_MEDIATEK_MDP
+       tristate "Mediatek MDP driver"
+       depends on V4L_MEM2MEM_DRIVERS
+       depends on MTK_IOMMU || COMPILE_TEST
+       depends on VIDEO_DEV && VIDEO_V4L2
+       depends on ARCH_MEDIATEK || COMPILE_TEST
+       depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_MEM2MEM_DEV
+       select VIDEO_MEDIATEK_VPU
+       help
+           It is a v4l2 driver and present in Mediatek MT8173 SoCs.
+           The driver supports for scaling and color space conversion.
+
+           To compile this driver as a module, choose M here: the
+           module will be called mtk-mdp.
diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile
new file mode 100644 (file)
index 0000000..5982d65
--- /dev/null
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+mtk-mdp-y += mtk_mdp_core.o
+mtk-mdp-y += mtk_mdp_comp.o
+mtk-mdp-y += mtk_mdp_m2m.o
+mtk-mdp-y += mtk_mdp_regs.o
+mtk-mdp-y += mtk_mdp_vpu.o
+
+obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o
+
+ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c
new file mode 100644 (file)
index 0000000..1e3833f
--- /dev/null
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+
+#include "mtk_mdp_comp.h"
+
+
+void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
+{
+       int i, err;
+
+       for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
+               if (IS_ERR(comp->clk[i]))
+                       continue;
+               err = clk_prepare_enable(comp->clk[i]);
+               if (err)
+                       dev_err(dev,
+                       "failed to enable clock, err %d. type:%d i:%d\n",
+                               err, comp->type, i);
+       }
+}
+
+void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
+               if (IS_ERR(comp->clk[i]))
+                       continue;
+               clk_disable_unprepare(comp->clk[i]);
+       }
+}
+
+int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
+                     struct mtk_mdp_comp *comp,
+                     enum mtk_mdp_comp_type comp_type)
+{
+       int ret;
+       int i;
+
+       comp->dev_node = of_node_get(node);
+       comp->type = comp_type;
+
+       for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
+               comp->clk[i] = of_clk_get(node, i);
+               if (IS_ERR(comp->clk[i])) {
+                       if (PTR_ERR(comp->clk[i]) != -EPROBE_DEFER)
+                               dev_err(dev, "Failed to get clock\n");
+                       ret = PTR_ERR(comp->clk[i]);
+                       goto put_dev;
+               }
+
+               /* Only RDMA needs two clocks */
+               if (comp->type != MTK_MDP_RDMA)
+                       break;
+       }
+
+       return 0;
+
+put_dev:
+       of_node_put(comp->dev_node);
+
+       return ret;
+}
+
+void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp)
+{
+       of_node_put(comp->dev_node);
+}
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h
new file mode 100644 (file)
index 0000000..ae41dd3
--- /dev/null
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#ifndef __MTK_MDP_COMP_H__
+#define __MTK_MDP_COMP_H__
+
+/**
+ * enum mtk_mdp_comp_type - the MDP component
+ * @MTK_MDP_RDMA:      Read DMA
+ * @MTK_MDP_RSZ:       Riszer
+ * @MTK_MDP_WDMA:      Write DMA
+ * @MTK_MDP_WROT:      Write DMA with rotation
+ */
+enum mtk_mdp_comp_type {
+       MTK_MDP_RDMA,
+       MTK_MDP_RSZ,
+       MTK_MDP_WDMA,
+       MTK_MDP_WROT,
+};
+
+/**
+ * struct mtk_mdp_comp - the MDP's function component data
+ * @node:      list node to track sibing MDP components
+ * @dev_node:  component device node
+ * @clk:       clocks required for component
+ * @type:      component type
+ */
+struct mtk_mdp_comp {
+       struct list_head        node;
+       struct device_node      *dev_node;
+       struct clk              *clk[2];
+       enum mtk_mdp_comp_type  type;
+};
+
+int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
+                     struct mtk_mdp_comp *comp,
+                     enum mtk_mdp_comp_type comp_type);
+void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp);
+void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp);
+void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp);
+
+
+#endif /* __MTK_MDP_COMP_H__ */
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c
new file mode 100644 (file)
index 0000000..d83c496
--- /dev/null
@@ -0,0 +1,314 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015-2016 MediaTek Inc.
+ * Author: Houlong Wei <houlong.wei@mediatek.com>
+ *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/workqueue.h>
+
+#include "mtk_mdp_core.h"
+#include "mtk_mdp_m2m.h"
+#include "mtk_vpu.h"
+
+/* MDP debug log level (0-3). 3 shows all the logs. */
+int mtk_mdp_dbg_level;
+EXPORT_SYMBOL(mtk_mdp_dbg_level);
+
+module_param(mtk_mdp_dbg_level, int, 0644);
+
+static const struct of_device_id mtk_mdp_comp_dt_ids[] = {
+       {
+               .compatible = "mediatek,mt8173-mdp-rdma",
+               .data = (void *)MTK_MDP_RDMA
+       }, {
+               .compatible = "mediatek,mt8173-mdp-rsz",
+               .data = (void *)MTK_MDP_RSZ
+       }, {
+               .compatible = "mediatek,mt8173-mdp-wdma",
+               .data = (void *)MTK_MDP_WDMA
+       }, {
+               .compatible = "mediatek,mt8173-mdp-wrot",
+               .data = (void *)MTK_MDP_WROT
+       },
+       { },
+};
+
+static const struct of_device_id mtk_mdp_of_ids[] = {
+       { .compatible = "mediatek,mt8173-mdp", },
+       { },
+};
+MODULE_DEVICE_TABLE(of, mtk_mdp_of_ids);
+
+static void mtk_mdp_clock_on(struct mtk_mdp_dev *mdp)
+{
+       struct device *dev = &mdp->pdev->dev;
+       struct mtk_mdp_comp *comp_node;
+
+       list_for_each_entry(comp_node, &mdp->comp_list, node)
+               mtk_mdp_comp_clock_on(dev, comp_node);
+}
+
+static void mtk_mdp_clock_off(struct mtk_mdp_dev *mdp)
+{
+       struct device *dev = &mdp->pdev->dev;
+       struct mtk_mdp_comp *comp_node;
+
+       list_for_each_entry(comp_node, &mdp->comp_list, node)
+               mtk_mdp_comp_clock_off(dev, comp_node);
+}
+
+static void mtk_mdp_wdt_worker(struct work_struct *work)
+{
+       struct mtk_mdp_dev *mdp =
+                       container_of(work, struct mtk_mdp_dev, wdt_work);
+       struct mtk_mdp_ctx *ctx;
+
+       mtk_mdp_err("Watchdog timeout");
+
+       list_for_each_entry(ctx, &mdp->ctx_list, list) {
+               mtk_mdp_dbg(0, "[%d] Change as state error", ctx->id);
+               mtk_mdp_ctx_state_lock_set(ctx, MTK_MDP_CTX_ERROR);
+       }
+}
+
+static void mtk_mdp_reset_handler(void *priv)
+{
+       struct mtk_mdp_dev *mdp = priv;
+
+       queue_work(mdp->wdt_wq, &mdp->wdt_work);
+}
+
+void mtk_mdp_register_component(struct mtk_mdp_dev *mdp,
+                               struct mtk_mdp_comp *comp)
+{
+       list_add(&comp->node, &mdp->comp_list);
+}
+
+void mtk_mdp_unregister_component(struct mtk_mdp_dev *mdp,
+                                 struct mtk_mdp_comp *comp)
+{
+       list_del(&comp->node);
+}
+
+static int mtk_mdp_probe(struct platform_device *pdev)
+{
+       struct mtk_mdp_dev *mdp;
+       struct device *dev = &pdev->dev;
+       struct device_node *node, *parent;
+       struct mtk_mdp_comp *comp, *comp_temp;
+       int ret = 0;
+
+       mdp = devm_kzalloc(dev, sizeof(*mdp), GFP_KERNEL);
+       if (!mdp)
+               return -ENOMEM;
+
+       mdp->id = pdev->id;
+       mdp->pdev = pdev;
+       INIT_LIST_HEAD(&mdp->comp_list);
+       INIT_LIST_HEAD(&mdp->ctx_list);
+
+       mutex_init(&mdp->lock);
+       mutex_init(&mdp->vpulock);
+
+       /* Old dts had the components as child nodes */
+       node = of_get_next_child(dev->of_node, NULL);
+       if (node) {
+               of_node_put(node);
+               parent = dev->of_node;
+               dev_warn(dev, "device tree is out of date\n");
+       } else {
+               parent = dev->of_node->parent;
+       }
+
+       /* Iterate over sibling MDP function blocks */
+       for_each_child_of_node(parent, node) {
+               const struct of_device_id *of_id;
+               enum mtk_mdp_comp_type comp_type;
+
+               of_id = of_match_node(mtk_mdp_comp_dt_ids, node);
+               if (!of_id)
+                       continue;
+
+               if (!of_device_is_available(node)) {
+                       dev_err(dev, "Skipping disabled component %pOF\n",
+                               node);
+                       continue;
+               }
+
+               comp_type = (uintptr_t)of_id->data;
+
+               comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL);
+               if (!comp) {
+                       ret = -ENOMEM;
+                       of_node_put(node);
+                       goto err_comp;
+               }
+
+               ret = mtk_mdp_comp_init(dev, node, comp, comp_type);
+               if (ret) {
+                       of_node_put(node);
+                       goto err_comp;
+               }
+
+               mtk_mdp_register_component(mdp, comp);
+       }
+
+       mdp->job_wq = create_singlethread_workqueue(MTK_MDP_MODULE_NAME);
+       if (!mdp->job_wq) {
+               dev_err(&pdev->dev, "unable to alloc job workqueue\n");
+               ret = -ENOMEM;
+               goto err_alloc_job_wq;
+       }
+
+       mdp->wdt_wq = create_singlethread_workqueue("mdp_wdt_wq");
+       if (!mdp->wdt_wq) {
+               dev_err(&pdev->dev, "unable to alloc wdt workqueue\n");
+               ret = -ENOMEM;
+               goto err_alloc_wdt_wq;
+       }
+       INIT_WORK(&mdp->wdt_work, mtk_mdp_wdt_worker);
+
+       ret = v4l2_device_register(dev, &mdp->v4l2_dev);
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to register v4l2 device\n");
+               ret = -EINVAL;
+               goto err_dev_register;
+       }
+
+       ret = mtk_mdp_register_m2m_device(mdp);
+       if (ret) {
+               v4l2_err(&mdp->v4l2_dev, "Failed to init mem2mem device\n");
+               goto err_m2m_register;
+       }
+
+       mdp->vpu_dev = vpu_get_plat_device(pdev);
+       ret = vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp,
+                                 VPU_RST_MDP);
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to register reset handler\n");
+               goto err_m2m_register;
+       }
+
+       platform_set_drvdata(pdev, mdp);
+
+       ret = vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to set vb2 dma mag seg size\n");
+               goto err_m2m_register;
+       }
+
+       pm_runtime_enable(dev);
+       dev_dbg(dev, "mdp-%d registered successfully\n", mdp->id);
+
+       return 0;
+
+err_m2m_register:
+       v4l2_device_unregister(&mdp->v4l2_dev);
+
+err_dev_register:
+       destroy_workqueue(mdp->wdt_wq);
+
+err_alloc_wdt_wq:
+       destroy_workqueue(mdp->job_wq);
+
+err_alloc_job_wq:
+
+err_comp:
+       list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) {
+               mtk_mdp_unregister_component(mdp, comp);
+               mtk_mdp_comp_deinit(dev, comp);
+       }
+
+       dev_dbg(dev, "err %d\n", ret);
+       return ret;
+}
+
+static int mtk_mdp_remove(struct platform_device *pdev)
+{
+       struct mtk_mdp_dev *mdp = platform_get_drvdata(pdev);
+       struct mtk_mdp_comp *comp, *comp_temp;
+
+       pm_runtime_disable(&pdev->dev);
+       vb2_dma_contig_clear_max_seg_size(&pdev->dev);
+       mtk_mdp_unregister_m2m_device(mdp);
+       v4l2_device_unregister(&mdp->v4l2_dev);
+
+       destroy_workqueue(mdp->wdt_wq);
+
+       destroy_workqueue(mdp->job_wq);
+
+       list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) {
+               mtk_mdp_unregister_component(mdp, comp);
+               mtk_mdp_comp_deinit(&pdev->dev, comp);
+       }
+
+       dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name);
+       return 0;
+}
+
+static int __maybe_unused mtk_mdp_pm_suspend(struct device *dev)
+{
+       struct mtk_mdp_dev *mdp = dev_get_drvdata(dev);
+
+       mtk_mdp_clock_off(mdp);
+
+       return 0;
+}
+
+static int __maybe_unused mtk_mdp_pm_resume(struct device *dev)
+{
+       struct mtk_mdp_dev *mdp = dev_get_drvdata(dev);
+
+       mtk_mdp_clock_on(mdp);
+
+       return 0;
+}
+
+static int __maybe_unused mtk_mdp_suspend(struct device *dev)
+{
+       if (pm_runtime_suspended(dev))
+               return 0;
+
+       return mtk_mdp_pm_suspend(dev);
+}
+
+static int __maybe_unused mtk_mdp_resume(struct device *dev)
+{
+       if (pm_runtime_suspended(dev))
+               return 0;
+
+       return mtk_mdp_pm_resume(dev);
+}
+
+static const struct dev_pm_ops mtk_mdp_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(mtk_mdp_suspend, mtk_mdp_resume)
+       SET_RUNTIME_PM_OPS(mtk_mdp_pm_suspend, mtk_mdp_pm_resume, NULL)
+};
+
+static struct platform_driver mtk_mdp_driver = {
+       .probe          = mtk_mdp_probe,
+       .remove         = mtk_mdp_remove,
+       .driver = {
+               .name   = MTK_MDP_MODULE_NAME,
+               .pm     = &mtk_mdp_pm_ops,
+               .of_match_table = mtk_mdp_of_ids,
+       }
+};
+
+module_platform_driver(mtk_mdp_driver);
+
+MODULE_AUTHOR("Houlong Wei <houlong.wei@mediatek.com>");
+MODULE_DESCRIPTION("Mediatek image processor driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h
new file mode 100644 (file)
index 0000000..a6e6dc3
--- /dev/null
@@ -0,0 +1,256 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2015-2016 MediaTek Inc.
+ * Author: Houlong Wei <houlong.wei@mediatek.com>
+ *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#ifndef __MTK_MDP_CORE_H__
+#define __MTK_MDP_CORE_H__
+
+#include <linux/videodev2.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-mem2mem.h>
+#include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-contig.h>
+
+#include "mtk_mdp_vpu.h"
+#include "mtk_mdp_comp.h"
+
+
+#define MTK_MDP_MODULE_NAME            "mtk-mdp"
+
+#define MTK_MDP_SHUTDOWN_TIMEOUT       ((100*HZ)/1000) /* 100ms */
+#define MTK_MDP_MAX_CTRL_NUM           10
+
+#define MTK_MDP_FMT_FLAG_OUTPUT                BIT(0)
+#define MTK_MDP_FMT_FLAG_CAPTURE       BIT(1)
+
+#define MTK_MDP_VPU_INIT               BIT(0)
+#define MTK_MDP_CTX_ERROR              BIT(5)
+
+/**
+ *  struct mtk_mdp_pix_align - alignment of image
+ *  @org_w: source alignment of width
+ *  @org_h: source alignment of height
+ *  @target_w: dst alignment of width
+ *  @target_h: dst alignment of height
+ */
+struct mtk_mdp_pix_align {
+       u16 org_w;
+       u16 org_h;
+       u16 target_w;
+       u16 target_h;
+};
+
+/**
+ * struct mtk_mdp_fmt - the driver's internal color format data
+ * @pixelformat: the fourcc code for this format, 0 if not applicable
+ * @num_planes: number of physically non-contiguous data planes
+ * @num_comp: number of logical data planes
+ * @depth: per plane driver's private 'number of bits per pixel'
+ * @row_depth: per plane driver's private 'number of bits per pixel per row'
+ * @flags: flags indicating which operation mode format applies to
+ *        MTK_MDP_FMT_FLAG_OUTPUT is used in OUTPUT stream
+ *        MTK_MDP_FMT_FLAG_CAPTURE is used in CAPTURE stream
+ * @align: pointer to a pixel alignment struct, NULL if using default value
+ */
+struct mtk_mdp_fmt {
+       u32     pixelformat;
+       u16     num_planes;
+       u16     num_comp;
+       u8      depth[VIDEO_MAX_PLANES];
+       u8      row_depth[VIDEO_MAX_PLANES];
+       u32     flags;
+       struct mtk_mdp_pix_align *align;
+};
+
+/**
+ * struct mtk_mdp_addr - the image processor physical address set
+ * @addr:      address of planes
+ */
+struct mtk_mdp_addr {
+       dma_addr_t addr[MTK_MDP_MAX_NUM_PLANE];
+};
+
+/* struct mtk_mdp_ctrls - the image processor control set
+ * @rotate: rotation degree
+ * @hflip: horizontal flip
+ * @vflip: vertical flip
+ * @global_alpha: the alpha value of current frame
+ */
+struct mtk_mdp_ctrls {
+       struct v4l2_ctrl *rotate;
+       struct v4l2_ctrl *hflip;
+       struct v4l2_ctrl *vflip;
+       struct v4l2_ctrl *global_alpha;
+};
+
+/**
+ * struct mtk_mdp_frame - source/target frame properties
+ * @width:     SRC : SRCIMG_WIDTH, DST : OUTPUTDMA_WHOLE_IMG_WIDTH
+ * @height:    SRC : SRCIMG_HEIGHT, DST : OUTPUTDMA_WHOLE_IMG_HEIGHT
+ * @crop:      cropped(source)/scaled(destination) size
+ * @payload:   image size in bytes (w x h x bpp)
+ * @pitch:     bytes per line of image in memory
+ * @addr:      image frame buffer physical addresses
+ * @fmt:       color format pointer
+ * @alpha:     frame's alpha value
+ */
+struct mtk_mdp_frame {
+       u32                             width;
+       u32                             height;
+       struct v4l2_rect                crop;
+       unsigned long                   payload[VIDEO_MAX_PLANES];
+       unsigned int                    pitch[VIDEO_MAX_PLANES];
+       struct mtk_mdp_addr             addr;
+       const struct mtk_mdp_fmt        *fmt;
+       u8                              alpha;
+};
+
+/**
+ * struct mtk_mdp_variant - image processor variant information
+ * @pix_max:           maximum limit of image size
+ * @pix_min:           minimum limit of image size
+ * @pix_align:         alignment of image
+ * @h_scale_up_max:    maximum scale-up in horizontal
+ * @v_scale_up_max:    maximum scale-up in vertical
+ * @h_scale_down_max:  maximum scale-down in horizontal
+ * @v_scale_down_max:  maximum scale-down in vertical
+ */
+struct mtk_mdp_variant {
+       struct mtk_mdp_pix_limit        *pix_max;
+       struct mtk_mdp_pix_limit        *pix_min;
+       struct mtk_mdp_pix_align        *pix_align;
+       u16                             h_scale_up_max;
+       u16                             v_scale_up_max;
+       u16                             h_scale_down_max;
+       u16                             v_scale_down_max;
+};
+
+/**
+ * struct mtk_mdp_dev - abstraction for image processor entity
+ * @lock:      the mutex protecting this data structure
+ * @vpulock:   the mutex protecting the communication with VPU
+ * @pdev:      pointer to the image processor platform device
+ * @variant:   the IP variant information
+ * @id:                image processor device index (0..MTK_MDP_MAX_DEVS)
+ * @comp_list: list of MDP function components
+ * @m2m_dev:   v4l2 memory-to-memory device data
+ * @ctx_list:  list of struct mtk_mdp_ctx
+ * @vdev:      video device for image processor driver
+ * @v4l2_dev:  V4L2 device to register video devices for.
+ * @job_wq:    processor work queue
+ * @vpu_dev:   VPU platform device
+ * @ctx_num:   counter of active MTK MDP context
+ * @id_counter:        An integer id given to the next opened context
+ * @wdt_wq:    work queue for VPU watchdog
+ * @wdt_work:  worker for VPU watchdog
+ */
+struct mtk_mdp_dev {
+       struct mutex                    lock;
+       struct mutex                    vpulock;
+       struct platform_device          *pdev;
+       struct mtk_mdp_variant          *variant;
+       u16                             id;
+       struct list_head                comp_list;
+       struct v4l2_m2m_dev             *m2m_dev;
+       struct list_head                ctx_list;
+       struct video_device             *vdev;
+       struct v4l2_device              v4l2_dev;
+       struct workqueue_struct         *job_wq;
+       struct platform_device          *vpu_dev;
+       int                             ctx_num;
+       unsigned long                   id_counter;
+       struct workqueue_struct         *wdt_wq;
+       struct work_struct              wdt_work;
+};
+
+/**
+ * struct mtk_mdp_ctx - the device context data
+ * @list:              link to ctx_list of mtk_mdp_dev
+ * @s_frame:           source frame properties
+ * @d_frame:           destination frame properties
+ * @id:                        index of the context that this structure describes
+ * @flags:             additional flags for image conversion
+ * @state:             flags to keep track of user configuration
+ *                     Protected by slock
+ * @rotation:          rotates the image by specified angle
+ * @hflip:             mirror the picture horizontally
+ * @vflip:             mirror the picture vertically
+ * @mdp_dev:           the image processor device this context applies to
+ * @m2m_ctx:           memory-to-memory device context
+ * @fh:                        v4l2 file handle
+ * @ctrl_handler:      v4l2 controls handler
+ * @ctrls:             image processor control set
+ * @ctrls_rdy:         true if the control handler is initialized
+ * @colorspace:                enum v4l2_colorspace; supplemental to pixelformat
+ * @ycbcr_enc:         enum v4l2_ycbcr_encoding, Y'CbCr encoding
+ * @xfer_func:         enum v4l2_xfer_func, colorspace transfer function
+ * @quant:             enum v4l2_quantization, colorspace quantization
+ * @vpu:               VPU instance
+ * @slock:             the mutex protecting mtp_mdp_ctx.state
+ * @work:              worker for image processing
+ */
+struct mtk_mdp_ctx {
+       struct list_head                list;
+       struct mtk_mdp_frame            s_frame;
+       struct mtk_mdp_frame            d_frame;
+       u32                             flags;
+       u32                             state;
+       int                             id;
+       int                             rotation;
+       u32                             hflip:1;
+       u32                             vflip:1;
+       struct mtk_mdp_dev              *mdp_dev;
+       struct v4l2_m2m_ctx             *m2m_ctx;
+       struct v4l2_fh                  fh;
+       struct v4l2_ctrl_handler        ctrl_handler;
+       struct mtk_mdp_ctrls            ctrls;
+       bool                            ctrls_rdy;
+       enum v4l2_colorspace            colorspace;
+       enum v4l2_ycbcr_encoding        ycbcr_enc;
+       enum v4l2_xfer_func             xfer_func;
+       enum v4l2_quantization          quant;
+
+       struct mtk_mdp_vpu              vpu;
+       struct mutex                    slock;
+       struct work_struct              work;
+};
+
+extern int mtk_mdp_dbg_level;
+
+void mtk_mdp_register_component(struct mtk_mdp_dev *mdp,
+                               struct mtk_mdp_comp *comp);
+
+void mtk_mdp_unregister_component(struct mtk_mdp_dev *mdp,
+                                 struct mtk_mdp_comp *comp);
+
+#if defined(DEBUG)
+
+#define mtk_mdp_dbg(level, fmt, args...)                                \
+       do {                                                             \
+               if (mtk_mdp_dbg_level >= level)                          \
+                       pr_info("[MTK_MDP] level=%d %s(),%d: " fmt "\n", \
+                               level, __func__, __LINE__, ##args);      \
+       } while (0)
+
+#define mtk_mdp_err(fmt, args...)                                      \
+       pr_err("[MTK_MDP][ERROR] %s:%d: " fmt "\n", __func__, __LINE__, \
+              ##args)
+
+
+#define mtk_mdp_dbg_enter()  mtk_mdp_dbg(3, "+")
+#define mtk_mdp_dbg_leave()  mtk_mdp_dbg(3, "-")
+
+#else
+
+#define mtk_mdp_dbg(level, fmt, args...) {}
+#define mtk_mdp_err(fmt, args...)
+#define mtk_mdp_dbg_enter()
+#define mtk_mdp_dbg_leave()
+
+#endif
+
+#endif /* __MTK_MDP_CORE_H__ */
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h
new file mode 100644 (file)
index 0000000..2cb8cec
--- /dev/null
@@ -0,0 +1,118 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2015-2016 MediaTek Inc.
+ * Author: Houlong Wei <houlong.wei@mediatek.com>
+ *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#ifndef __MTK_MDP_IPI_H__
+#define __MTK_MDP_IPI_H__
+
+#define MTK_MDP_MAX_NUM_PLANE          3
+
+enum mdp_ipi_msgid {
+       AP_MDP_INIT             = 0xd000,
+       AP_MDP_DEINIT           = 0xd001,
+       AP_MDP_PROCESS          = 0xd002,
+
+       VPU_MDP_INIT_ACK        = 0xe000,
+       VPU_MDP_DEINIT_ACK      = 0xe001,
+       VPU_MDP_PROCESS_ACK     = 0xe002
+};
+
+#pragma pack(push, 4)
+
+/**
+ * struct mdp_ipi_init - for AP_MDP_INIT
+ * @msg_id   : AP_MDP_INIT
+ * @ipi_id   : IPI_MDP
+ * @ap_inst  : AP mtk_mdp_vpu address
+ */
+struct mdp_ipi_init {
+       uint32_t msg_id;
+       uint32_t ipi_id;
+       uint64_t ap_inst;
+};
+
+/**
+ * struct mdp_ipi_comm - for AP_MDP_PROCESS, AP_MDP_DEINIT
+ * @msg_id        : AP_MDP_PROCESS, AP_MDP_DEINIT
+ * @ipi_id        : IPI_MDP
+ * @ap_inst       : AP mtk_mdp_vpu address
+ * @vpu_inst_addr : VPU MDP instance address
+ */
+struct mdp_ipi_comm {
+       uint32_t msg_id;
+       uint32_t ipi_id;
+       uint64_t ap_inst;
+       uint32_t vpu_inst_addr;
+};
+
+/**
+ * struct mdp_ipi_comm_ack - for VPU_MDP_DEINIT_ACK, VPU_MDP_PROCESS_ACK
+ * @msg_id        : VPU_MDP_DEINIT_ACK, VPU_MDP_PROCESS_ACK
+ * @ipi_id        : IPI_MDP
+ * @ap_inst       : AP mtk_mdp_vpu address
+ * @vpu_inst_addr : VPU MDP instance address
+ * @status        : VPU exeuction result
+ */
+struct mdp_ipi_comm_ack {
+       uint32_t msg_id;
+       uint32_t ipi_id;
+       uint64_t ap_inst;
+       uint32_t vpu_inst_addr;
+       int32_t status;
+};
+
+/**
+ * struct mdp_config - configured for source/destination image
+ * @x        : left
+ * @y        : top
+ * @w        : width
+ * @h        : height
+ * @w_stride : bytes in horizontal
+ * @h_stride : bytes in vertical
+ * @crop_x   : cropped left
+ * @crop_y   : cropped top
+ * @crop_w   : cropped width
+ * @crop_h   : cropped height
+ * @format   : color format
+ */
+struct mdp_config {
+       int32_t x;
+       int32_t y;
+       int32_t w;
+       int32_t h;
+       int32_t w_stride;
+       int32_t h_stride;
+       int32_t crop_x;
+       int32_t crop_y;
+       int32_t crop_w;
+       int32_t crop_h;
+       int32_t format;
+};
+
+struct mdp_buffer {
+       uint64_t addr_mva[MTK_MDP_MAX_NUM_PLANE];
+       int32_t plane_size[MTK_MDP_MAX_NUM_PLANE];
+       int32_t plane_num;
+};
+
+struct mdp_config_misc {
+       int32_t orientation; /* 0, 90, 180, 270 */
+       int32_t hflip; /* 1 will enable the flip */
+       int32_t vflip; /* 1 will enable the flip */
+       int32_t alpha; /* global alpha */
+};
+
+struct mdp_process_vsi {
+       struct mdp_config src_config;
+       struct mdp_buffer src_buffer;
+       struct mdp_config dst_config;
+       struct mdp_buffer dst_buffer;
+       struct mdp_config_misc misc;
+};
+
+#pragma pack(pop)
+
+#endif /* __MTK_MDP_IPI_H__ */
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c
new file mode 100644 (file)
index 0000000..f14779e
--- /dev/null
@@ -0,0 +1,1229 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015-2016 MediaTek Inc.
+ * Author: Houlong Wei <houlong.wei@mediatek.com>
+ *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-ioctl.h>
+
+#include "mtk_mdp_core.h"
+#include "mtk_mdp_m2m.h"
+#include "mtk_mdp_regs.h"
+#include "mtk_vpu.h"
+
+
+/**
+ *  struct mtk_mdp_pix_limit - image pixel size limits
+ *  @org_w: source pixel width
+ *  @org_h: source pixel height
+ *  @target_rot_dis_w: pixel dst scaled width with the rotator is off
+ *  @target_rot_dis_h: pixel dst scaled height with the rotator is off
+ *  @target_rot_en_w: pixel dst scaled width with the rotator is on
+ *  @target_rot_en_h: pixel dst scaled height with the rotator is on
+ */
+struct mtk_mdp_pix_limit {
+       u16 org_w;
+       u16 org_h;
+       u16 target_rot_dis_w;
+       u16 target_rot_dis_h;
+       u16 target_rot_en_w;
+       u16 target_rot_en_h;
+};
+
+static struct mtk_mdp_pix_align mtk_mdp_size_align = {
+       .org_w                  = 16,
+       .org_h                  = 16,
+       .target_w               = 2,
+       .target_h               = 2,
+};
+
+static const struct mtk_mdp_fmt mtk_mdp_formats[] = {
+       {
+               .pixelformat    = V4L2_PIX_FMT_MT21C,
+               .depth          = { 8, 4 },
+               .row_depth      = { 8, 8 },
+               .num_planes     = 2,
+               .num_comp       = 2,
+               .align          = &mtk_mdp_size_align,
+               .flags          = MTK_MDP_FMT_FLAG_OUTPUT,
+       }, {
+               .pixelformat    = V4L2_PIX_FMT_NV12M,
+               .depth          = { 8, 4 },
+               .row_depth      = { 8, 8 },
+               .num_planes     = 2,
+               .num_comp       = 2,
+               .flags          = MTK_MDP_FMT_FLAG_OUTPUT |
+                                 MTK_MDP_FMT_FLAG_CAPTURE,
+       }, {
+               .pixelformat    = V4L2_PIX_FMT_YUV420M,
+               .depth          = { 8, 2, 2 },
+               .row_depth      = { 8, 4, 4 },
+               .num_planes     = 3,
+               .num_comp       = 3,
+               .flags          = MTK_MDP_FMT_FLAG_OUTPUT |
+                                 MTK_MDP_FMT_FLAG_CAPTURE,
+       }, {
+               .pixelformat    = V4L2_PIX_FMT_YVU420,
+               .depth          = { 12 },
+               .row_depth      = { 8 },
+               .num_planes     = 1,
+               .num_comp       = 3,
+               .flags          = MTK_MDP_FMT_FLAG_OUTPUT |
+                                 MTK_MDP_FMT_FLAG_CAPTURE,
+       }
+};
+
+static struct mtk_mdp_pix_limit mtk_mdp_size_max = {
+       .target_rot_dis_w       = 4096,
+       .target_rot_dis_h       = 4096,
+       .target_rot_en_w        = 4096,
+       .target_rot_en_h        = 4096,
+};
+
+static struct mtk_mdp_pix_limit mtk_mdp_size_min = {
+       .org_w                  = 16,
+       .org_h                  = 16,
+       .target_rot_dis_w       = 16,
+       .target_rot_dis_h       = 16,
+       .target_rot_en_w        = 16,
+       .target_rot_en_h        = 16,
+};
+
+/* align size for normal raster scan pixel format */
+static struct mtk_mdp_pix_align mtk_mdp_rs_align = {
+       .org_w                  = 2,
+       .org_h                  = 2,
+       .target_w               = 2,
+       .target_h               = 2,
+};
+
+static struct mtk_mdp_variant mtk_mdp_default_variant = {
+       .pix_max                = &mtk_mdp_size_max,
+       .pix_min                = &mtk_mdp_size_min,
+       .pix_align              = &mtk_mdp_rs_align,
+       .h_scale_up_max         = 32,
+       .v_scale_up_max         = 32,
+       .h_scale_down_max       = 32,
+       .v_scale_down_max       = 128,
+};
+
+static const struct mtk_mdp_fmt *mtk_mdp_find_fmt(u32 pixelformat, u32 type)
+{
+       u32 i, flag;
+
+       flag = V4L2_TYPE_IS_OUTPUT(type) ? MTK_MDP_FMT_FLAG_OUTPUT :
+                                          MTK_MDP_FMT_FLAG_CAPTURE;
+
+       for (i = 0; i < ARRAY_SIZE(mtk_mdp_formats); ++i) {
+               if (!(mtk_mdp_formats[i].flags & flag))
+                       continue;
+               if (mtk_mdp_formats[i].pixelformat == pixelformat)
+                       return &mtk_mdp_formats[i];
+       }
+       return NULL;
+}
+
+static const struct mtk_mdp_fmt *mtk_mdp_find_fmt_by_index(u32 index, u32 type)
+{
+       u32 i, flag, num = 0;
+
+       flag = V4L2_TYPE_IS_OUTPUT(type) ? MTK_MDP_FMT_FLAG_OUTPUT :
+                                          MTK_MDP_FMT_FLAG_CAPTURE;
+
+       for (i = 0; i < ARRAY_SIZE(mtk_mdp_formats); ++i) {
+               if (!(mtk_mdp_formats[i].flags & flag))
+                       continue;
+               if (index == num)
+                       return &mtk_mdp_formats[i];
+               num++;
+       }
+       return NULL;
+}
+
+static void mtk_mdp_bound_align_image(u32 *w, unsigned int wmin,
+                                     unsigned int wmax, unsigned int align_w,
+                                     u32 *h, unsigned int hmin,
+                                     unsigned int hmax, unsigned int align_h)
+{
+       int org_w, org_h, step_w, step_h;
+       int walign, halign;
+
+       org_w = *w;
+       org_h = *h;
+       walign = ffs(align_w) - 1;
+       halign = ffs(align_h) - 1;
+       v4l_bound_align_image(w, wmin, wmax, walign, h, hmin, hmax, halign, 0);
+
+       step_w = 1 << walign;
+       step_h = 1 << halign;
+       if (*w < org_w && (*w + step_w) <= wmax)
+               *w += step_w;
+       if (*h < org_h && (*h + step_h) <= hmax)
+               *h += step_h;
+}
+
+static const struct mtk_mdp_fmt *mtk_mdp_try_fmt_mplane(struct mtk_mdp_ctx *ctx,
+                                                       struct v4l2_format *f)
+{
+       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
+       struct mtk_mdp_variant *variant = mdp->variant;
+       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
+       const struct mtk_mdp_fmt *fmt;
+       u32 max_w, max_h, align_w, align_h;
+       u32 min_w, min_h, org_w, org_h;
+       int i;
+
+       fmt = mtk_mdp_find_fmt(pix_mp->pixelformat, f->type);
+       if (!fmt)
+               fmt = mtk_mdp_find_fmt_by_index(0, f->type);
+       if (!fmt) {
+               dev_dbg(&ctx->mdp_dev->pdev->dev,
+                       "pixelformat format 0x%X invalid\n",
+                       pix_mp->pixelformat);
+               return NULL;
+       }
+
+       pix_mp->field = V4L2_FIELD_NONE;
+       pix_mp->pixelformat = fmt->pixelformat;
+       if (V4L2_TYPE_IS_CAPTURE(f->type)) {
+               pix_mp->colorspace = ctx->colorspace;
+               pix_mp->xfer_func = ctx->xfer_func;
+               pix_mp->ycbcr_enc = ctx->ycbcr_enc;
+               pix_mp->quantization = ctx->quant;
+       }
+
+       max_w = variant->pix_max->target_rot_dis_w;
+       max_h = variant->pix_max->target_rot_dis_h;
+
+       if (fmt->align == NULL) {
+               /* use default alignment */
+               align_w = variant->pix_align->org_w;
+               align_h = variant->pix_align->org_h;
+       } else {
+               align_w = fmt->align->org_w;
+               align_h = fmt->align->org_h;
+       }
+
+       if (V4L2_TYPE_IS_OUTPUT(f->type)) {
+               min_w = variant->pix_min->org_w;
+               min_h = variant->pix_min->org_h;
+       } else {
+               min_w = variant->pix_min->target_rot_dis_w;
+               min_h = variant->pix_min->target_rot_dis_h;
+       }
+
+       mtk_mdp_dbg(2, "[%d] type:%d, wxh:%ux%u, align:%ux%u, max:%ux%u",
+                   ctx->id, f->type, pix_mp->width, pix_mp->height,
+                   align_w, align_h, max_w, max_h);
+       /*
+        * To check if image size is modified to adjust parameter against
+        * hardware abilities
+        */
+       org_w = pix_mp->width;
+       org_h = pix_mp->height;
+
+       mtk_mdp_bound_align_image(&pix_mp->width, min_w, max_w, align_w,
+                                 &pix_mp->height, min_h, max_h, align_h);
+
+       if (org_w != pix_mp->width || org_h != pix_mp->height)
+               mtk_mdp_dbg(1, "[%d] size change:%ux%u to %ux%u", ctx->id,
+                           org_w, org_h, pix_mp->width, pix_mp->height);
+       pix_mp->num_planes = fmt->num_planes;
+
+       for (i = 0; i < pix_mp->num_planes; ++i) {
+               int bpl = (pix_mp->width * fmt->row_depth[i]) / 8;
+               int sizeimage = (pix_mp->width * pix_mp->height *
+                       fmt->depth[i]) / 8;
+
+               pix_mp->plane_fmt[i].bytesperline = bpl;
+               if (pix_mp->plane_fmt[i].sizeimage < sizeimage)
+                       pix_mp->plane_fmt[i].sizeimage = sizeimage;
+               mtk_mdp_dbg(2, "[%d] p%d, bpl:%d, sizeimage:%u (%u)", ctx->id,
+                           i, bpl, pix_mp->plane_fmt[i].sizeimage, sizeimage);
+       }
+
+       return fmt;
+}
+
+static struct mtk_mdp_frame *mtk_mdp_ctx_get_frame(struct mtk_mdp_ctx *ctx,
+                                           enum v4l2_buf_type type)
+{
+       if (V4L2_TYPE_IS_OUTPUT(type))
+               return &ctx->s_frame;
+       return &ctx->d_frame;
+}
+
+static void mtk_mdp_check_crop_change(u32 new_w, u32 new_h, u32 *w, u32 *h)
+{
+       if (new_w != *w || new_h != *h) {
+               mtk_mdp_dbg(1, "size change:%dx%d to %dx%d",
+                           *w, *h, new_w, new_h);
+
+               *w = new_w;
+               *h = new_h;
+       }
+}
+
+static int mtk_mdp_try_crop(struct mtk_mdp_ctx *ctx, u32 type,
+                           struct v4l2_rect *r)
+{
+       struct mtk_mdp_frame *frame;
+       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
+       struct mtk_mdp_variant *variant = mdp->variant;
+       u32 align_w, align_h, new_w, new_h;
+       u32 min_w, min_h, max_w, max_h;
+
+       if (r->top < 0 || r->left < 0) {
+               dev_err(&ctx->mdp_dev->pdev->dev,
+                       "doesn't support negative values for top & left\n");
+               return -EINVAL;
+       }
+
+       mtk_mdp_dbg(2, "[%d] type:%d, set wxh:%dx%d", ctx->id, type,
+                   r->width, r->height);
+
+       frame = mtk_mdp_ctx_get_frame(ctx, type);
+       max_w = frame->width;
+       max_h = frame->height;
+       new_w = r->width;
+       new_h = r->height;
+
+       if (V4L2_TYPE_IS_OUTPUT(type)) {
+               align_w = 1;
+               align_h = 1;
+               min_w = 64;
+               min_h = 32;
+       } else {
+               align_w = variant->pix_align->target_w;
+               align_h = variant->pix_align->target_h;
+               if (ctx->ctrls.rotate->val == 90 ||
+                   ctx->ctrls.rotate->val == 270) {
+                       max_w = frame->height;
+                       max_h = frame->width;
+                       min_w = variant->pix_min->target_rot_en_w;
+                       min_h = variant->pix_min->target_rot_en_h;
+                       new_w = r->height;
+                       new_h = r->width;
+               } else {
+                       min_w = variant->pix_min->target_rot_dis_w;
+                       min_h = variant->pix_min->target_rot_dis_h;
+               }
+       }
+
+       mtk_mdp_dbg(2, "[%d] align:%dx%d, min:%dx%d, new:%dx%d", ctx->id,
+                   align_w, align_h, min_w, min_h, new_w, new_h);
+
+       mtk_mdp_bound_align_image(&new_w, min_w, max_w, align_w,
+                                 &new_h, min_h, max_h, align_h);
+
+       if (V4L2_TYPE_IS_CAPTURE(type) &&
+           (ctx->ctrls.rotate->val == 90 || ctx->ctrls.rotate->val == 270))
+               mtk_mdp_check_crop_change(new_h, new_w,
+                                         &r->width, &r->height);
+       else
+               mtk_mdp_check_crop_change(new_w, new_h,
+                                         &r->width, &r->height);
+
+       /* adjust left/top if cropping rectangle is out of bounds */
+       /* Need to add code to algin left value with 2's multiple */
+       if (r->left + new_w > max_w)
+               r->left = max_w - new_w;
+       if (r->top + new_h > max_h)
+               r->top = max_h - new_h;
+
+       if (r->left & 1)
+               r->left -= 1;
+
+       mtk_mdp_dbg(2, "[%d] crop l,t,w,h:%d,%d,%d,%d, max:%dx%d", ctx->id,
+                   r->left, r->top, r->width,
+                   r->height, max_w, max_h);
+       return 0;
+}
+
+static inline struct mtk_mdp_ctx *fh_to_ctx(struct v4l2_fh *fh)
+{
+       return container_of(fh, struct mtk_mdp_ctx, fh);
+}
+
+static inline struct mtk_mdp_ctx *ctrl_to_ctx(struct v4l2_ctrl *ctrl)
+{
+       return container_of(ctrl->handler, struct mtk_mdp_ctx, ctrl_handler);
+}
+
+void mtk_mdp_ctx_state_lock_set(struct mtk_mdp_ctx *ctx, u32 state)
+{
+       mutex_lock(&ctx->slock);
+       ctx->state |= state;
+       mutex_unlock(&ctx->slock);
+}
+
+static bool mtk_mdp_ctx_state_is_set(struct mtk_mdp_ctx *ctx, u32 mask)
+{
+       bool ret;
+
+       mutex_lock(&ctx->slock);
+       ret = (ctx->state & mask) == mask;
+       mutex_unlock(&ctx->slock);
+       return ret;
+}
+
+static void mtk_mdp_set_frame_size(struct mtk_mdp_frame *frame, int width,
+                                  int height)
+{
+       frame->width = width;
+       frame->height = height;
+       frame->crop.width = width;
+       frame->crop.height = height;
+       frame->crop.left = 0;
+       frame->crop.top = 0;
+}
+
+static int mtk_mdp_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
+{
+       struct mtk_mdp_ctx *ctx = q->drv_priv;
+       int ret;
+
+       ret = pm_runtime_resume_and_get(&ctx->mdp_dev->pdev->dev);
+       if (ret < 0)
+               mtk_mdp_dbg(1, "[%d] pm_runtime_resume_and_get failed:%d",
+                           ctx->id, ret);
+
+       return ret;
+}
+
+static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx,
+                                   enum v4l2_buf_type type)
+{
+       if (V4L2_TYPE_IS_OUTPUT(type))
+               return v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
+       else
+               return v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
+}
+
+static void mtk_mdp_m2m_stop_streaming(struct vb2_queue *q)
+{
+       struct mtk_mdp_ctx *ctx = q->drv_priv;
+       struct vb2_buffer *vb;
+
+       vb = mtk_mdp_m2m_buf_remove(ctx, q->type);
+       while (vb != NULL) {
+               v4l2_m2m_buf_done(to_vb2_v4l2_buffer(vb), VB2_BUF_STATE_ERROR);
+               vb = mtk_mdp_m2m_buf_remove(ctx, q->type);
+       }
+
+       pm_runtime_put(&ctx->mdp_dev->pdev->dev);
+}
+
+/* The color format (num_planes) must be already configured. */
+static void mtk_mdp_prepare_addr(struct mtk_mdp_ctx *ctx,
+                                struct vb2_buffer *vb,
+                                struct mtk_mdp_frame *frame,
+                                struct mtk_mdp_addr *addr)
+{
+       u32 pix_size, planes, i;
+
+       pix_size = frame->width * frame->height;
+       planes = min_t(u32, frame->fmt->num_planes, ARRAY_SIZE(addr->addr));
+       for (i = 0; i < planes; i++)
+               addr->addr[i] = vb2_dma_contig_plane_dma_addr(vb, i);
+
+       if (planes == 1) {
+               if (frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420) {
+                       addr->addr[1] = (dma_addr_t)(addr->addr[0] + pix_size);
+                       addr->addr[2] = (dma_addr_t)(addr->addr[1] +
+                                       (pix_size >> 2));
+               } else {
+                       dev_err(&ctx->mdp_dev->pdev->dev,
+                               "Invalid pixelformat:0x%x\n",
+                               frame->fmt->pixelformat);
+               }
+       }
+       mtk_mdp_dbg(3, "[%d] planes:%d, size:%d, addr:%p,%p,%p",
+                   ctx->id, planes, pix_size, (void *)addr->addr[0],
+                   (void *)addr->addr[1], (void *)addr->addr[2]);
+}
+
+static void mtk_mdp_m2m_get_bufs(struct mtk_mdp_ctx *ctx)
+{
+       struct mtk_mdp_frame *s_frame, *d_frame;
+       struct vb2_v4l2_buffer *src_vbuf, *dst_vbuf;
+
+       s_frame = &ctx->s_frame;
+       d_frame = &ctx->d_frame;
+
+       src_vbuf = v4l2_m2m_next_src_buf(ctx->m2m_ctx);
+       mtk_mdp_prepare_addr(ctx, &src_vbuf->vb2_buf, s_frame, &s_frame->addr);
+
+       dst_vbuf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
+       mtk_mdp_prepare_addr(ctx, &dst_vbuf->vb2_buf, d_frame, &d_frame->addr);
+
+       dst_vbuf->vb2_buf.timestamp = src_vbuf->vb2_buf.timestamp;
+}
+
+static void mtk_mdp_process_done(void *priv, int vb_state)
+{
+       struct mtk_mdp_dev *mdp = priv;
+       struct mtk_mdp_ctx *ctx;
+       struct vb2_v4l2_buffer *src_vbuf, *dst_vbuf;
+
+       ctx = v4l2_m2m_get_curr_priv(mdp->m2m_dev);
+       if (!ctx)
+               return;
+
+       src_vbuf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
+       dst_vbuf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
+
+       dst_vbuf->vb2_buf.timestamp = src_vbuf->vb2_buf.timestamp;
+       dst_vbuf->timecode = src_vbuf->timecode;
+       dst_vbuf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+       dst_vbuf->flags |= src_vbuf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+
+       v4l2_m2m_buf_done(src_vbuf, vb_state);
+       v4l2_m2m_buf_done(dst_vbuf, vb_state);
+       v4l2_m2m_job_finish(ctx->mdp_dev->m2m_dev, ctx->m2m_ctx);
+}
+
+static void mtk_mdp_m2m_worker(struct work_struct *work)
+{
+       struct mtk_mdp_ctx *ctx =
+                               container_of(work, struct mtk_mdp_ctx, work);
+       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
+       enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
+       int ret;
+
+       if (mtk_mdp_ctx_state_is_set(ctx, MTK_MDP_CTX_ERROR)) {
+               dev_err(&mdp->pdev->dev, "ctx is in error state");
+               goto worker_end;
+       }
+
+       mtk_mdp_m2m_get_bufs(ctx);
+
+       mtk_mdp_hw_set_input_addr(ctx, &ctx->s_frame.addr);
+       mtk_mdp_hw_set_output_addr(ctx, &ctx->d_frame.addr);
+
+       mtk_mdp_hw_set_in_size(ctx);
+       mtk_mdp_hw_set_in_image_format(ctx);
+
+       mtk_mdp_hw_set_out_size(ctx);
+       mtk_mdp_hw_set_out_image_format(ctx);
+
+       mtk_mdp_hw_set_rotation(ctx);
+       mtk_mdp_hw_set_global_alpha(ctx);
+
+       ret = mtk_mdp_vpu_process(&ctx->vpu);
+       if (ret) {
+               dev_err(&mdp->pdev->dev, "processing failed: %d", ret);
+               goto worker_end;
+       }
+
+       buf_state = VB2_BUF_STATE_DONE;
+
+worker_end:
+       mtk_mdp_process_done(mdp, buf_state);
+}
+
+static void mtk_mdp_m2m_device_run(void *priv)
+{
+       struct mtk_mdp_ctx *ctx = priv;
+
+       queue_work(ctx->mdp_dev->job_wq, &ctx->work);
+}
+
+static int mtk_mdp_m2m_queue_setup(struct vb2_queue *vq,
+                       unsigned int *num_buffers, unsigned int *num_planes,
+                       unsigned int sizes[], struct device *alloc_devs[])
+{
+       struct mtk_mdp_ctx *ctx = vb2_get_drv_priv(vq);
+       struct mtk_mdp_frame *frame;
+       int i;
+
+       frame = mtk_mdp_ctx_get_frame(ctx, vq->type);
+       *num_planes = frame->fmt->num_planes;
+       for (i = 0; i < frame->fmt->num_planes; i++)
+               sizes[i] = frame->payload[i];
+       mtk_mdp_dbg(2, "[%d] type:%d, planes:%d, buffers:%d, size:%u,%u",
+                   ctx->id, vq->type, *num_planes, *num_buffers,
+                   sizes[0], sizes[1]);
+       return 0;
+}
+
+static int mtk_mdp_m2m_buf_prepare(struct vb2_buffer *vb)
+{
+       struct mtk_mdp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+       struct mtk_mdp_frame *frame;
+       int i;
+
+       frame = mtk_mdp_ctx_get_frame(ctx, vb->vb2_queue->type);
+
+       if (!V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
+               for (i = 0; i < frame->fmt->num_planes; i++)
+                       vb2_set_plane_payload(vb, i, frame->payload[i]);
+       }
+
+       return 0;
+}
+
+static void mtk_mdp_m2m_buf_queue(struct vb2_buffer *vb)
+{
+       struct mtk_mdp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+
+       v4l2_m2m_buf_queue(ctx->m2m_ctx, to_vb2_v4l2_buffer(vb));
+}
+
+static const struct vb2_ops mtk_mdp_m2m_qops = {
+       .queue_setup     = mtk_mdp_m2m_queue_setup,
+       .buf_prepare     = mtk_mdp_m2m_buf_prepare,
+       .buf_queue       = mtk_mdp_m2m_buf_queue,
+       .stop_streaming  = mtk_mdp_m2m_stop_streaming,
+       .start_streaming = mtk_mdp_m2m_start_streaming,
+       .wait_prepare    = vb2_ops_wait_prepare,
+       .wait_finish     = vb2_ops_wait_finish,
+};
+
+static int mtk_mdp_m2m_querycap(struct file *file, void *fh,
+                               struct v4l2_capability *cap)
+{
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
+
+       strscpy(cap->driver, MTK_MDP_MODULE_NAME, sizeof(cap->driver));
+       strscpy(cap->card, mdp->pdev->name, sizeof(cap->card));
+       strscpy(cap->bus_info, "platform:mt8173", sizeof(cap->bus_info));
+
+       return 0;
+}
+
+static int mtk_mdp_enum_fmt(struct v4l2_fmtdesc *f, u32 type)
+{
+       const struct mtk_mdp_fmt *fmt;
+
+       fmt = mtk_mdp_find_fmt_by_index(f->index, type);
+       if (!fmt)
+               return -EINVAL;
+
+       f->pixelformat = fmt->pixelformat;
+
+       return 0;
+}
+
+static int mtk_mdp_m2m_enum_fmt_vid_cap(struct file *file, void *priv,
+                                       struct v4l2_fmtdesc *f)
+{
+       return mtk_mdp_enum_fmt(f, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
+}
+
+static int mtk_mdp_m2m_enum_fmt_vid_out(struct file *file, void *priv,
+                                       struct v4l2_fmtdesc *f)
+{
+       return mtk_mdp_enum_fmt(f, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+}
+
+static int mtk_mdp_m2m_g_fmt_mplane(struct file *file, void *fh,
+                                   struct v4l2_format *f)
+{
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+       struct mtk_mdp_frame *frame;
+       struct v4l2_pix_format_mplane *pix_mp;
+       int i;
+
+       mtk_mdp_dbg(2, "[%d] type:%d", ctx->id, f->type);
+
+       frame = mtk_mdp_ctx_get_frame(ctx, f->type);
+       pix_mp = &f->fmt.pix_mp;
+
+       pix_mp->width = frame->width;
+       pix_mp->height = frame->height;
+       pix_mp->field = V4L2_FIELD_NONE;
+       pix_mp->pixelformat = frame->fmt->pixelformat;
+       pix_mp->num_planes = frame->fmt->num_planes;
+       pix_mp->colorspace = ctx->colorspace;
+       pix_mp->xfer_func = ctx->xfer_func;
+       pix_mp->ycbcr_enc = ctx->ycbcr_enc;
+       pix_mp->quantization = ctx->quant;
+       mtk_mdp_dbg(2, "[%d] wxh:%dx%d", ctx->id,
+                   pix_mp->width, pix_mp->height);
+
+       for (i = 0; i < pix_mp->num_planes; ++i) {
+               pix_mp->plane_fmt[i].bytesperline = (frame->width *
+                       frame->fmt->row_depth[i]) / 8;
+               pix_mp->plane_fmt[i].sizeimage = (frame->width *
+                       frame->height * frame->fmt->depth[i]) / 8;
+
+               mtk_mdp_dbg(2, "[%d] p%d, bpl:%d, sizeimage:%d", ctx->id, i,
+                           pix_mp->plane_fmt[i].bytesperline,
+                           pix_mp->plane_fmt[i].sizeimage);
+       }
+
+       return 0;
+}
+
+static int mtk_mdp_m2m_try_fmt_mplane(struct file *file, void *fh,
+                                     struct v4l2_format *f)
+{
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+
+       if (!mtk_mdp_try_fmt_mplane(ctx, f))
+               return -EINVAL;
+       return 0;
+}
+
+static int mtk_mdp_m2m_s_fmt_mplane(struct file *file, void *fh,
+                                   struct v4l2_format *f)
+{
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+       struct vb2_queue *vq;
+       struct mtk_mdp_frame *frame;
+       struct v4l2_pix_format_mplane *pix_mp;
+       const struct mtk_mdp_fmt *fmt;
+       int i;
+
+       mtk_mdp_dbg(2, "[%d] type:%d", ctx->id, f->type);
+
+       frame = mtk_mdp_ctx_get_frame(ctx, f->type);
+       fmt = mtk_mdp_try_fmt_mplane(ctx, f);
+       if (!fmt) {
+               mtk_mdp_err("[%d] try_fmt failed, type:%d", ctx->id, f->type);
+               return -EINVAL;
+       }
+       frame->fmt = fmt;
+
+       vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);
+       if (vb2_is_streaming(vq)) {
+               dev_info(&ctx->mdp_dev->pdev->dev, "queue %d busy", f->type);
+               return -EBUSY;
+       }
+
+       pix_mp = &f->fmt.pix_mp;
+       for (i = 0; i < frame->fmt->num_planes; i++) {
+               frame->payload[i] = pix_mp->plane_fmt[i].sizeimage;
+               frame->pitch[i] = pix_mp->plane_fmt[i].bytesperline;
+       }
+
+       mtk_mdp_set_frame_size(frame, pix_mp->width, pix_mp->height);
+       if (V4L2_TYPE_IS_OUTPUT(f->type)) {
+               ctx->colorspace = pix_mp->colorspace;
+               ctx->xfer_func = pix_mp->xfer_func;
+               ctx->ycbcr_enc = pix_mp->ycbcr_enc;
+               ctx->quant = pix_mp->quantization;
+       }
+
+       mtk_mdp_dbg(2, "[%d] type:%d, frame:%dx%d", ctx->id, f->type,
+                   frame->width, frame->height);
+
+       return 0;
+}
+
+static int mtk_mdp_m2m_reqbufs(struct file *file, void *fh,
+                              struct v4l2_requestbuffers *reqbufs)
+{
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+
+       return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);
+}
+
+static int mtk_mdp_m2m_streamon(struct file *file, void *fh,
+                               enum v4l2_buf_type type)
+{
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+       int ret;
+
+       if (!mtk_mdp_ctx_state_is_set(ctx, MTK_MDP_VPU_INIT)) {
+               ret = mtk_mdp_vpu_init(&ctx->vpu);
+               if (ret < 0) {
+                       dev_err(&ctx->mdp_dev->pdev->dev,
+                               "vpu init failed %d\n",
+                               ret);
+                       return -EINVAL;
+               }
+               mtk_mdp_ctx_state_lock_set(ctx, MTK_MDP_VPU_INIT);
+       }
+
+       return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);
+}
+
+static inline bool mtk_mdp_is_target_compose(u32 target)
+{
+       if (target == V4L2_SEL_TGT_COMPOSE_DEFAULT
+           || target == V4L2_SEL_TGT_COMPOSE_BOUNDS
+           || target == V4L2_SEL_TGT_COMPOSE)
+               return true;
+       return false;
+}
+
+static inline bool mtk_mdp_is_target_crop(u32 target)
+{
+       if (target == V4L2_SEL_TGT_CROP_DEFAULT
+           || target == V4L2_SEL_TGT_CROP_BOUNDS
+           || target == V4L2_SEL_TGT_CROP)
+               return true;
+       return false;
+}
+
+static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
+                                      struct v4l2_selection *s)
+{
+       struct mtk_mdp_frame *frame;
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+       bool valid = false;
+
+       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               if (mtk_mdp_is_target_compose(s->target))
+                       valid = true;
+       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               if (mtk_mdp_is_target_crop(s->target))
+                       valid = true;
+       }
+       if (!valid) {
+               mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
+                           s->target);
+               return -EINVAL;
+       }
+
+       frame = mtk_mdp_ctx_get_frame(ctx, s->type);
+
+       switch (s->target) {
+       case V4L2_SEL_TGT_COMPOSE_DEFAULT:
+       case V4L2_SEL_TGT_COMPOSE_BOUNDS:
+       case V4L2_SEL_TGT_CROP_BOUNDS:
+       case V4L2_SEL_TGT_CROP_DEFAULT:
+               s->r.left = 0;
+               s->r.top = 0;
+               s->r.width = frame->width;
+               s->r.height = frame->height;
+               return 0;
+
+       case V4L2_SEL_TGT_COMPOSE:
+       case V4L2_SEL_TGT_CROP:
+               s->r.left = frame->crop.left;
+               s->r.top = frame->crop.top;
+               s->r.width = frame->crop.width;
+               s->r.height = frame->crop.height;
+               return 0;
+       }
+
+       return -EINVAL;
+}
+
+static int mtk_mdp_check_scaler_ratio(struct mtk_mdp_variant *var, int src_w,
+                                     int src_h, int dst_w, int dst_h, int rot)
+{
+       int tmp_w, tmp_h;
+
+       if (rot == 90 || rot == 270) {
+               tmp_w = dst_h;
+               tmp_h = dst_w;
+       } else {
+               tmp_w = dst_w;
+               tmp_h = dst_h;
+       }
+
+       if ((src_w / tmp_w) > var->h_scale_down_max ||
+           (src_h / tmp_h) > var->v_scale_down_max ||
+           (tmp_w / src_w) > var->h_scale_up_max ||
+           (tmp_h / src_h) > var->v_scale_up_max)
+               return -EINVAL;
+
+       return 0;
+}
+
+static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
+                                  struct v4l2_selection *s)
+{
+       struct mtk_mdp_frame *frame;
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
+       struct v4l2_rect new_r;
+       struct mtk_mdp_variant *variant = ctx->mdp_dev->variant;
+       int ret;
+       bool valid = false;
+
+       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               if (s->target == V4L2_SEL_TGT_COMPOSE)
+                       valid = true;
+       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               if (s->target == V4L2_SEL_TGT_CROP)
+                       valid = true;
+       }
+       if (!valid) {
+               mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
+                           s->target);
+               return -EINVAL;
+       }
+
+       new_r = s->r;
+       ret = mtk_mdp_try_crop(ctx, s->type, &new_r);
+       if (ret)
+               return ret;
+
+       if (mtk_mdp_is_target_crop(s->target))
+               frame = &ctx->s_frame;
+       else
+               frame = &ctx->d_frame;
+
+       /* Check to see if scaling ratio is within supported range */
+       if (V4L2_TYPE_IS_OUTPUT(s->type))
+               ret = mtk_mdp_check_scaler_ratio(variant, new_r.width,
+                       new_r.height, ctx->d_frame.crop.width,
+                       ctx->d_frame.crop.height,
+                       ctx->ctrls.rotate->val);
+       else
+               ret = mtk_mdp_check_scaler_ratio(variant,
+                       ctx->s_frame.crop.width,
+                       ctx->s_frame.crop.height, new_r.width,
+                       new_r.height, ctx->ctrls.rotate->val);
+
+       if (ret) {
+               dev_info(&ctx->mdp_dev->pdev->dev,
+                       "Out of scaler range");
+               return -EINVAL;
+       }
+
+       s->r = new_r;
+       frame->crop = new_r;
+
+       return 0;
+}
+
+static const struct v4l2_ioctl_ops mtk_mdp_m2m_ioctl_ops = {
+       .vidioc_querycap                = mtk_mdp_m2m_querycap,
+       .vidioc_enum_fmt_vid_cap        = mtk_mdp_m2m_enum_fmt_vid_cap,
+       .vidioc_enum_fmt_vid_out        = mtk_mdp_m2m_enum_fmt_vid_out,
+       .vidioc_g_fmt_vid_cap_mplane    = mtk_mdp_m2m_g_fmt_mplane,
+       .vidioc_g_fmt_vid_out_mplane    = mtk_mdp_m2m_g_fmt_mplane,
+       .vidioc_try_fmt_vid_cap_mplane  = mtk_mdp_m2m_try_fmt_mplane,
+       .vidioc_try_fmt_vid_out_mplane  = mtk_mdp_m2m_try_fmt_mplane,
+       .vidioc_s_fmt_vid_cap_mplane    = mtk_mdp_m2m_s_fmt_mplane,
+       .vidioc_s_fmt_vid_out_mplane    = mtk_mdp_m2m_s_fmt_mplane,
+       .vidioc_reqbufs                 = mtk_mdp_m2m_reqbufs,
+       .vidioc_create_bufs             = v4l2_m2m_ioctl_create_bufs,
+       .vidioc_expbuf                  = v4l2_m2m_ioctl_expbuf,
+       .vidioc_subscribe_event         = v4l2_ctrl_subscribe_event,
+       .vidioc_unsubscribe_event       = v4l2_event_unsubscribe,
+       .vidioc_querybuf                = v4l2_m2m_ioctl_querybuf,
+       .vidioc_qbuf                    = v4l2_m2m_ioctl_qbuf,
+       .vidioc_dqbuf                   = v4l2_m2m_ioctl_dqbuf,
+       .vidioc_streamon                = mtk_mdp_m2m_streamon,
+       .vidioc_streamoff               = v4l2_m2m_ioctl_streamoff,
+       .vidioc_g_selection             = mtk_mdp_m2m_g_selection,
+       .vidioc_s_selection             = mtk_mdp_m2m_s_selection
+};
+
+static int mtk_mdp_m2m_queue_init(void *priv, struct vb2_queue *src_vq,
+                                 struct vb2_queue *dst_vq)
+{
+       struct mtk_mdp_ctx *ctx = priv;
+       int ret;
+
+       memset(src_vq, 0, sizeof(*src_vq));
+       src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+       src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+       src_vq->drv_priv = ctx;
+       src_vq->ops = &mtk_mdp_m2m_qops;
+       src_vq->mem_ops = &vb2_dma_contig_memops;
+       src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+       src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+       src_vq->dev = &ctx->mdp_dev->pdev->dev;
+       src_vq->lock = &ctx->mdp_dev->lock;
+
+       ret = vb2_queue_init(src_vq);
+       if (ret)
+               return ret;
+
+       memset(dst_vq, 0, sizeof(*dst_vq));
+       dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+       dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+       dst_vq->drv_priv = ctx;
+       dst_vq->ops = &mtk_mdp_m2m_qops;
+       dst_vq->mem_ops = &vb2_dma_contig_memops;
+       dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+       dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+       dst_vq->dev = &ctx->mdp_dev->pdev->dev;
+       dst_vq->lock = &ctx->mdp_dev->lock;
+
+       return vb2_queue_init(dst_vq);
+}
+
+static int mtk_mdp_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+       struct mtk_mdp_ctx *ctx = ctrl_to_ctx(ctrl);
+       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
+       struct mtk_mdp_variant *variant = mdp->variant;
+       int ret = 0;
+
+       if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE)
+               return 0;
+
+       switch (ctrl->id) {
+       case V4L2_CID_HFLIP:
+               ctx->hflip = ctrl->val;
+               break;
+       case V4L2_CID_VFLIP:
+               ctx->vflip = ctrl->val;
+               break;
+       case V4L2_CID_ROTATE:
+               ret = mtk_mdp_check_scaler_ratio(variant,
+                               ctx->s_frame.crop.width,
+                               ctx->s_frame.crop.height,
+                               ctx->d_frame.crop.width,
+                               ctx->d_frame.crop.height,
+                               ctx->ctrls.rotate->val);
+
+               if (ret)
+                       return -EINVAL;
+
+               ctx->rotation = ctrl->val;
+               break;
+       case V4L2_CID_ALPHA_COMPONENT:
+               ctx->d_frame.alpha = ctrl->val;
+               break;
+       }
+
+       return 0;
+}
+
+static const struct v4l2_ctrl_ops mtk_mdp_ctrl_ops = {
+       .s_ctrl = mtk_mdp_s_ctrl,
+};
+
+static int mtk_mdp_ctrls_create(struct mtk_mdp_ctx *ctx)
+{
+       v4l2_ctrl_handler_init(&ctx->ctrl_handler, MTK_MDP_MAX_CTRL_NUM);
+
+       ctx->ctrls.rotate = v4l2_ctrl_new_std(&ctx->ctrl_handler,
+                       &mtk_mdp_ctrl_ops, V4L2_CID_ROTATE, 0, 270, 90, 0);
+       ctx->ctrls.hflip = v4l2_ctrl_new_std(&ctx->ctrl_handler,
+                                            &mtk_mdp_ctrl_ops,
+                                            V4L2_CID_HFLIP,
+                                            0, 1, 1, 0);
+       ctx->ctrls.vflip = v4l2_ctrl_new_std(&ctx->ctrl_handler,
+                                            &mtk_mdp_ctrl_ops,
+                                            V4L2_CID_VFLIP,
+                                            0, 1, 1, 0);
+       ctx->ctrls.global_alpha = v4l2_ctrl_new_std(&ctx->ctrl_handler,
+                                                   &mtk_mdp_ctrl_ops,
+                                                   V4L2_CID_ALPHA_COMPONENT,
+                                                   0, 255, 1, 0);
+       ctx->ctrls_rdy = ctx->ctrl_handler.error == 0;
+
+       if (ctx->ctrl_handler.error) {
+               int err = ctx->ctrl_handler.error;
+
+               v4l2_ctrl_handler_free(&ctx->ctrl_handler);
+               dev_err(&ctx->mdp_dev->pdev->dev,
+                       "Failed to create control handlers\n");
+               return err;
+       }
+
+       return 0;
+}
+
+static void mtk_mdp_set_default_params(struct mtk_mdp_ctx *ctx)
+{
+       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
+       struct mtk_mdp_frame *frame;
+
+       frame = mtk_mdp_ctx_get_frame(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+       frame->fmt = mtk_mdp_find_fmt_by_index(0,
+                                       V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+       frame->width = mdp->variant->pix_min->org_w;
+       frame->height = mdp->variant->pix_min->org_h;
+       frame->payload[0] = frame->width * frame->height;
+       frame->payload[1] = frame->payload[0] / 2;
+
+       frame = mtk_mdp_ctx_get_frame(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
+       frame->fmt = mtk_mdp_find_fmt_by_index(0,
+                                       V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
+       frame->width = mdp->variant->pix_min->target_rot_dis_w;
+       frame->height = mdp->variant->pix_min->target_rot_dis_h;
+       frame->payload[0] = frame->width * frame->height;
+       frame->payload[1] = frame->payload[0] / 2;
+
+}
+
+static int mtk_mdp_m2m_open(struct file *file)
+{
+       struct mtk_mdp_dev *mdp = video_drvdata(file);
+       struct video_device *vfd = video_devdata(file);
+       struct mtk_mdp_ctx *ctx = NULL;
+       int ret;
+       struct v4l2_format default_format;
+
+       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+       if (!ctx)
+               return -ENOMEM;
+
+       if (mutex_lock_interruptible(&mdp->lock)) {
+               ret = -ERESTARTSYS;
+               goto err_lock;
+       }
+
+       mutex_init(&ctx->slock);
+       ctx->id = mdp->id_counter++;
+       v4l2_fh_init(&ctx->fh, vfd);
+       file->private_data = &ctx->fh;
+       ret = mtk_mdp_ctrls_create(ctx);
+       if (ret)
+               goto error_ctrls;
+
+       /* Use separate control handler per file handle */
+       ctx->fh.ctrl_handler = &ctx->ctrl_handler;
+       v4l2_fh_add(&ctx->fh);
+       INIT_LIST_HEAD(&ctx->list);
+
+       ctx->mdp_dev = mdp;
+       mtk_mdp_set_default_params(ctx);
+
+       INIT_WORK(&ctx->work, mtk_mdp_m2m_worker);
+       ctx->m2m_ctx = v4l2_m2m_ctx_init(mdp->m2m_dev, ctx,
+                                        mtk_mdp_m2m_queue_init);
+       if (IS_ERR(ctx->m2m_ctx)) {
+               dev_err(&mdp->pdev->dev, "Failed to initialize m2m context");
+               ret = PTR_ERR(ctx->m2m_ctx);
+               goto error_m2m_ctx;
+       }
+       ctx->fh.m2m_ctx = ctx->m2m_ctx;
+       if (mdp->ctx_num++ == 0) {
+               ret = vpu_load_firmware(mdp->vpu_dev);
+               if (ret < 0) {
+                       dev_err(&mdp->pdev->dev,
+                               "vpu_load_firmware failed %d\n", ret);
+                       goto err_load_vpu;
+               }
+
+               ret = mtk_mdp_vpu_register(mdp->pdev);
+               if (ret < 0) {
+                       dev_err(&mdp->pdev->dev,
+                               "mdp_vpu register failed %d\n", ret);
+                       goto err_load_vpu;
+               }
+       }
+
+       list_add(&ctx->list, &mdp->ctx_list);
+       mutex_unlock(&mdp->lock);
+
+       /* Default format */
+       memset(&default_format, 0, sizeof(default_format));
+       default_format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+       default_format.fmt.pix_mp.width = 32;
+       default_format.fmt.pix_mp.height = 32;
+       default_format.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_YUV420M;
+       mtk_mdp_m2m_s_fmt_mplane(file, &ctx->fh, &default_format);
+       default_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+       mtk_mdp_m2m_s_fmt_mplane(file, &ctx->fh, &default_format);
+
+       mtk_mdp_dbg(0, "%s [%d]", dev_name(&mdp->pdev->dev), ctx->id);
+
+       return 0;
+
+err_load_vpu:
+       mdp->ctx_num--;
+       v4l2_m2m_ctx_release(ctx->m2m_ctx);
+error_m2m_ctx:
+       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
+error_ctrls:
+       v4l2_fh_del(&ctx->fh);
+       v4l2_fh_exit(&ctx->fh);
+       mutex_unlock(&mdp->lock);
+err_lock:
+       kfree(ctx);
+
+       return ret;
+}
+
+static int mtk_mdp_m2m_release(struct file *file)
+{
+       struct mtk_mdp_ctx *ctx = fh_to_ctx(file->private_data);
+       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
+
+       flush_workqueue(mdp->job_wq);
+       mutex_lock(&mdp->lock);
+       v4l2_m2m_ctx_release(ctx->m2m_ctx);
+       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
+       v4l2_fh_del(&ctx->fh);
+       v4l2_fh_exit(&ctx->fh);
+       mtk_mdp_vpu_deinit(&ctx->vpu);
+       mdp->ctx_num--;
+       list_del_init(&ctx->list);
+
+       mtk_mdp_dbg(0, "%s [%d]", dev_name(&mdp->pdev->dev), ctx->id);
+
+       mutex_unlock(&mdp->lock);
+       kfree(ctx);
+
+       return 0;
+}
+
+static const struct v4l2_file_operations mtk_mdp_m2m_fops = {
+       .owner          = THIS_MODULE,
+       .open           = mtk_mdp_m2m_open,
+       .release        = mtk_mdp_m2m_release,
+       .poll           = v4l2_m2m_fop_poll,
+       .unlocked_ioctl = video_ioctl2,
+       .mmap           = v4l2_m2m_fop_mmap,
+};
+
+static const struct v4l2_m2m_ops mtk_mdp_m2m_ops = {
+       .device_run     = mtk_mdp_m2m_device_run,
+};
+
+int mtk_mdp_register_m2m_device(struct mtk_mdp_dev *mdp)
+{
+       struct device *dev = &mdp->pdev->dev;
+       int ret;
+
+       mdp->variant = &mtk_mdp_default_variant;
+       mdp->vdev = video_device_alloc();
+       if (!mdp->vdev) {
+               dev_err(dev, "failed to allocate video device\n");
+               ret = -ENOMEM;
+               goto err_video_alloc;
+       }
+       mdp->vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
+       mdp->vdev->fops = &mtk_mdp_m2m_fops;
+       mdp->vdev->ioctl_ops = &mtk_mdp_m2m_ioctl_ops;
+       mdp->vdev->release = video_device_release;
+       mdp->vdev->lock = &mdp->lock;
+       mdp->vdev->vfl_dir = VFL_DIR_M2M;
+       mdp->vdev->v4l2_dev = &mdp->v4l2_dev;
+       snprintf(mdp->vdev->name, sizeof(mdp->vdev->name), "%s:m2m",
+                MTK_MDP_MODULE_NAME);
+       video_set_drvdata(mdp->vdev, mdp);
+
+       mdp->m2m_dev = v4l2_m2m_init(&mtk_mdp_m2m_ops);
+       if (IS_ERR(mdp->m2m_dev)) {
+               dev_err(dev, "failed to initialize v4l2-m2m device\n");
+               ret = PTR_ERR(mdp->m2m_dev);
+               goto err_m2m_init;
+       }
+
+       ret = video_register_device(mdp->vdev, VFL_TYPE_VIDEO, 2);
+       if (ret) {
+               dev_err(dev, "failed to register video device\n");
+               goto err_vdev_register;
+       }
+
+       v4l2_info(&mdp->v4l2_dev, "driver registered as /dev/video%d",
+                 mdp->vdev->num);
+       return 0;
+
+err_vdev_register:
+       v4l2_m2m_release(mdp->m2m_dev);
+err_m2m_init:
+       video_device_release(mdp->vdev);
+err_video_alloc:
+
+       return ret;
+}
+
+void mtk_mdp_unregister_m2m_device(struct mtk_mdp_dev *mdp)
+{
+       video_unregister_device(mdp->vdev);
+       v4l2_m2m_release(mdp->m2m_dev);
+}
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h
new file mode 100644 (file)
index 0000000..485dbdb
--- /dev/null
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#ifndef __MTK_MDP_M2M_H__
+#define __MTK_MDP_M2M_H__
+
+void mtk_mdp_ctx_state_lock_set(struct mtk_mdp_ctx *ctx, u32 state);
+int mtk_mdp_register_m2m_device(struct mtk_mdp_dev *mdp);
+void mtk_mdp_unregister_m2m_device(struct mtk_mdp_dev *mdp);
+
+#endif /* __MTK_MDP_M2M_H__ */
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c
new file mode 100644 (file)
index 0000000..ba476d5
--- /dev/null
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015-2016 MediaTek Inc.
+ * Author: Houlong Wei <houlong.wei@mediatek.com>
+ *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#include <linux/platform_device.h>
+
+#include "mtk_mdp_core.h"
+#include "mtk_mdp_regs.h"
+
+
+#define MDP_COLORFMT_PACK(VIDEO, PLANE, COPLANE, HF, VF, BITS, GROUP, SWAP, ID)\
+       (((VIDEO) << 27) | ((PLANE) << 24) | ((COPLANE) << 22) |\
+       ((HF) << 20) | ((VF) << 18) | ((BITS) << 8) | ((GROUP) << 6) |\
+       ((SWAP) << 5) | ((ID) << 0))
+
+enum MDP_COLOR_ENUM {
+       MDP_COLOR_UNKNOWN = 0,
+       MDP_COLOR_NV12 = MDP_COLORFMT_PACK(0, 2, 1, 1, 1, 8, 1, 0, 12),
+       MDP_COLOR_I420 = MDP_COLORFMT_PACK(0, 3, 0, 1, 1, 8, 1, 0, 8),
+       MDP_COLOR_YV12 = MDP_COLORFMT_PACK(0, 3, 0, 1, 1, 8, 1, 1, 8),
+       /* Mediatek proprietary format */
+       MDP_COLOR_420_MT21 = MDP_COLORFMT_PACK(5, 2, 1, 1, 1, 256, 1, 0, 12),
+};
+
+static int32_t mtk_mdp_map_color_format(int v4l2_format)
+{
+       switch (v4l2_format) {
+       case V4L2_PIX_FMT_NV12M:
+       case V4L2_PIX_FMT_NV12:
+               return MDP_COLOR_NV12;
+       case V4L2_PIX_FMT_MT21C:
+               return MDP_COLOR_420_MT21;
+       case V4L2_PIX_FMT_YUV420M:
+       case V4L2_PIX_FMT_YUV420:
+               return MDP_COLOR_I420;
+       case V4L2_PIX_FMT_YVU420:
+               return MDP_COLOR_YV12;
+       }
+
+       mtk_mdp_err("Unknown format 0x%x", v4l2_format);
+
+       return MDP_COLOR_UNKNOWN;
+}
+
+void mtk_mdp_hw_set_input_addr(struct mtk_mdp_ctx *ctx,
+                              struct mtk_mdp_addr *addr)
+{
+       struct mdp_buffer *src_buf = &ctx->vpu.vsi->src_buffer;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(addr->addr); i++)
+               src_buf->addr_mva[i] = (uint64_t)addr->addr[i];
+}
+
+void mtk_mdp_hw_set_output_addr(struct mtk_mdp_ctx *ctx,
+                               struct mtk_mdp_addr *addr)
+{
+       struct mdp_buffer *dst_buf = &ctx->vpu.vsi->dst_buffer;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(addr->addr); i++)
+               dst_buf->addr_mva[i] = (uint64_t)addr->addr[i];
+}
+
+void mtk_mdp_hw_set_in_size(struct mtk_mdp_ctx *ctx)
+{
+       struct mtk_mdp_frame *frame = &ctx->s_frame;
+       struct mdp_config *config = &ctx->vpu.vsi->src_config;
+
+       /* Set input pixel offset */
+       config->crop_x = frame->crop.left;
+       config->crop_y = frame->crop.top;
+
+       /* Set input cropped size */
+       config->crop_w = frame->crop.width;
+       config->crop_h = frame->crop.height;
+
+       /* Set input original size */
+       config->x = 0;
+       config->y = 0;
+       config->w = frame->width;
+       config->h = frame->height;
+}
+
+void mtk_mdp_hw_set_in_image_format(struct mtk_mdp_ctx *ctx)
+{
+       unsigned int i;
+       struct mtk_mdp_frame *frame = &ctx->s_frame;
+       struct mdp_config *config = &ctx->vpu.vsi->src_config;
+       struct mdp_buffer *src_buf = &ctx->vpu.vsi->src_buffer;
+
+       src_buf->plane_num = frame->fmt->num_comp;
+       config->format = mtk_mdp_map_color_format(frame->fmt->pixelformat);
+       config->w_stride = 0; /* MDP will calculate it by color format. */
+       config->h_stride = 0; /* MDP will calculate it by color format. */
+
+       for (i = 0; i < src_buf->plane_num; i++)
+               src_buf->plane_size[i] = frame->payload[i];
+}
+
+void mtk_mdp_hw_set_out_size(struct mtk_mdp_ctx *ctx)
+{
+       struct mtk_mdp_frame *frame = &ctx->d_frame;
+       struct mdp_config *config = &ctx->vpu.vsi->dst_config;
+
+       config->crop_x = frame->crop.left;
+       config->crop_y = frame->crop.top;
+       config->crop_w = frame->crop.width;
+       config->crop_h = frame->crop.height;
+       config->x = 0;
+       config->y = 0;
+       config->w = frame->width;
+       config->h = frame->height;
+}
+
+void mtk_mdp_hw_set_out_image_format(struct mtk_mdp_ctx *ctx)
+{
+       unsigned int i;
+       struct mtk_mdp_frame *frame = &ctx->d_frame;
+       struct mdp_config *config = &ctx->vpu.vsi->dst_config;
+       struct mdp_buffer *dst_buf = &ctx->vpu.vsi->dst_buffer;
+
+       dst_buf->plane_num = frame->fmt->num_comp;
+       config->format = mtk_mdp_map_color_format(frame->fmt->pixelformat);
+       config->w_stride = 0; /* MDP will calculate it by color format. */
+       config->h_stride = 0; /* MDP will calculate it by color format. */
+       for (i = 0; i < dst_buf->plane_num; i++)
+               dst_buf->plane_size[i] = frame->payload[i];
+}
+
+void mtk_mdp_hw_set_rotation(struct mtk_mdp_ctx *ctx)
+{
+       struct mdp_config_misc *misc = &ctx->vpu.vsi->misc;
+
+       misc->orientation = ctx->ctrls.rotate->val;
+       misc->hflip = ctx->ctrls.hflip->val;
+       misc->vflip = ctx->ctrls.vflip->val;
+}
+
+void mtk_mdp_hw_set_global_alpha(struct mtk_mdp_ctx *ctx)
+{
+       struct mdp_config_misc *misc = &ctx->vpu.vsi->misc;
+
+       misc->alpha = ctx->ctrls.global_alpha->val;
+}
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h
new file mode 100644 (file)
index 0000000..32cf202
--- /dev/null
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#ifndef __MTK_MDP_REGS_H__
+#define __MTK_MDP_REGS_H__
+
+
+void mtk_mdp_hw_set_input_addr(struct mtk_mdp_ctx *ctx,
+                              struct mtk_mdp_addr *addr);
+void mtk_mdp_hw_set_output_addr(struct mtk_mdp_ctx *ctx,
+                               struct mtk_mdp_addr *addr);
+void mtk_mdp_hw_set_in_size(struct mtk_mdp_ctx *ctx);
+void mtk_mdp_hw_set_in_image_format(struct mtk_mdp_ctx *ctx);
+void mtk_mdp_hw_set_out_size(struct mtk_mdp_ctx *ctx);
+void mtk_mdp_hw_set_out_image_format(struct mtk_mdp_ctx *ctx);
+void mtk_mdp_hw_set_rotation(struct mtk_mdp_ctx *ctx);
+void mtk_mdp_hw_set_global_alpha(struct mtk_mdp_ctx *ctx);
+
+
+#endif /* __MTK_MDP_REGS_H__ */
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c
new file mode 100644 (file)
index 0000000..b065ccd
--- /dev/null
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015-2016 MediaTek Inc.
+ * Author: Houlong Wei <houlong.wei@mediatek.com>
+ *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#include "mtk_mdp_core.h"
+#include "mtk_mdp_vpu.h"
+#include "mtk_vpu.h"
+
+
+static inline struct mtk_mdp_ctx *vpu_to_ctx(struct mtk_mdp_vpu *vpu)
+{
+       return container_of(vpu, struct mtk_mdp_ctx, vpu);
+}
+
+static void mtk_mdp_vpu_handle_init_ack(const struct mdp_ipi_comm_ack *msg)
+{
+       struct mtk_mdp_vpu *vpu = (struct mtk_mdp_vpu *)
+                                       (unsigned long)msg->ap_inst;
+
+       /* mapping VPU address to kernel virtual address */
+       vpu->vsi = (struct mdp_process_vsi *)
+                       vpu_mapping_dm_addr(vpu->pdev, msg->vpu_inst_addr);
+       vpu->inst_addr = msg->vpu_inst_addr;
+}
+
+static void mtk_mdp_vpu_ipi_handler(const void *data, unsigned int len,
+                                   void *priv)
+{
+       const struct mdp_ipi_comm_ack *msg = data;
+       unsigned int msg_id = msg->msg_id;
+       struct mtk_mdp_vpu *vpu = (struct mtk_mdp_vpu *)
+                                       (unsigned long)msg->ap_inst;
+       struct mtk_mdp_ctx *ctx;
+
+       vpu->failure = msg->status;
+       if (!vpu->failure) {
+               switch (msg_id) {
+               case VPU_MDP_INIT_ACK:
+                       mtk_mdp_vpu_handle_init_ack(data);
+                       break;
+               case VPU_MDP_DEINIT_ACK:
+               case VPU_MDP_PROCESS_ACK:
+                       break;
+               default:
+                       ctx = vpu_to_ctx(vpu);
+                       dev_err(&ctx->mdp_dev->pdev->dev,
+                               "handle unknown ipi msg:0x%x\n",
+                               msg_id);
+                       break;
+               }
+       } else {
+               ctx = vpu_to_ctx(vpu);
+               mtk_mdp_dbg(0, "[%d]:msg 0x%x, failure:%d", ctx->id,
+                           msg_id, vpu->failure);
+       }
+}
+
+int mtk_mdp_vpu_register(struct platform_device *pdev)
+{
+       struct mtk_mdp_dev *mdp = platform_get_drvdata(pdev);
+       int err;
+
+       err = vpu_ipi_register(mdp->vpu_dev, IPI_MDP,
+                              mtk_mdp_vpu_ipi_handler, "mdp_vpu", NULL);
+       if (err)
+               dev_err(&mdp->pdev->dev,
+                       "vpu_ipi_registration fail status=%d\n", err);
+
+       return err;
+}
+
+static int mtk_mdp_vpu_send_msg(void *msg, int len, struct mtk_mdp_vpu *vpu,
+                               int id)
+{
+       struct mtk_mdp_ctx *ctx = vpu_to_ctx(vpu);
+       int err;
+
+       if (!vpu->pdev) {
+               mtk_mdp_dbg(1, "[%d]:vpu pdev is NULL", ctx->id);
+               return -EINVAL;
+       }
+
+       mutex_lock(&ctx->mdp_dev->vpulock);
+       err = vpu_ipi_send(vpu->pdev, (enum ipi_id)id, msg, len);
+       if (err)
+               dev_err(&ctx->mdp_dev->pdev->dev,
+                       "vpu_ipi_send fail status %d\n", err);
+       mutex_unlock(&ctx->mdp_dev->vpulock);
+
+       return err;
+}
+
+static int mtk_mdp_vpu_send_ap_ipi(struct mtk_mdp_vpu *vpu, uint32_t msg_id)
+{
+       int err;
+       struct mdp_ipi_comm msg;
+
+       msg.msg_id = msg_id;
+       msg.ipi_id = IPI_MDP;
+       msg.vpu_inst_addr = vpu->inst_addr;
+       msg.ap_inst = (unsigned long)vpu;
+       err = mtk_mdp_vpu_send_msg((void *)&msg, sizeof(msg), vpu, IPI_MDP);
+       if (!err && vpu->failure)
+               err = -EINVAL;
+
+       return err;
+}
+
+int mtk_mdp_vpu_init(struct mtk_mdp_vpu *vpu)
+{
+       int err;
+       struct mdp_ipi_init msg;
+       struct mtk_mdp_ctx *ctx = vpu_to_ctx(vpu);
+
+       vpu->pdev = ctx->mdp_dev->vpu_dev;
+
+       msg.msg_id = AP_MDP_INIT;
+       msg.ipi_id = IPI_MDP;
+       msg.ap_inst = (unsigned long)vpu;
+       err = mtk_mdp_vpu_send_msg((void *)&msg, sizeof(msg), vpu, IPI_MDP);
+       if (!err && vpu->failure)
+               err = -EINVAL;
+
+       return err;
+}
+
+int mtk_mdp_vpu_deinit(struct mtk_mdp_vpu *vpu)
+{
+       return mtk_mdp_vpu_send_ap_ipi(vpu, AP_MDP_DEINIT);
+}
+
+int mtk_mdp_vpu_process(struct mtk_mdp_vpu *vpu)
+{
+       return mtk_mdp_vpu_send_ap_ipi(vpu, AP_MDP_PROCESS);
+}
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h
new file mode 100644 (file)
index 0000000..5a10205
--- /dev/null
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2015-2016 MediaTek Inc.
+ * Author: Houlong Wei <houlong.wei@mediatek.com>
+ *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
+ */
+
+#ifndef __MTK_MDP_VPU_H__
+#define __MTK_MDP_VPU_H__
+
+#include "mtk_mdp_ipi.h"
+
+
+/**
+ * struct mtk_mdp_vpu - VPU instance for MDP
+ * @pdev       : pointer to the VPU platform device
+ * @inst_addr  : VPU MDP instance address
+ * @failure    : VPU execution result status
+ * @vsi                : VPU shared information
+ */
+struct mtk_mdp_vpu {
+       struct platform_device  *pdev;
+       uint32_t                inst_addr;
+       int32_t                 failure;
+       struct mdp_process_vsi  *vsi;
+};
+
+int mtk_mdp_vpu_register(struct platform_device *pdev);
+int mtk_mdp_vpu_init(struct mtk_mdp_vpu *vpu);
+int mtk_mdp_vpu_deinit(struct mtk_mdp_vpu *vpu);
+int mtk_mdp_vpu_process(struct mtk_mdp_vpu *vpu);
+
+#endif /* __MTK_MDP_VPU_H__ */
diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mtk-mdp/Kconfig
deleted file mode 100644 (file)
index 0cc7431..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-config VIDEO_MEDIATEK_MDP
-       tristate "Mediatek MDP driver"
-       depends on V4L_MEM2MEM_DRIVERS
-       depends on MTK_IOMMU || COMPILE_TEST
-       depends on VIDEO_DEV && VIDEO_V4L2
-       depends on ARCH_MEDIATEK || COMPILE_TEST
-       depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
-       select VIDEOBUF2_DMA_CONTIG
-       select V4L2_MEM2MEM_DEV
-       select VIDEO_MEDIATEK_VPU
-       help
-           It is a v4l2 driver and present in Mediatek MT8173 SoCs.
-           The driver supports for scaling and color space conversion.
-
-           To compile this driver as a module, choose M here: the
-           module will be called mtk-mdp.
diff --git a/drivers/media/platform/mtk-mdp/Makefile b/drivers/media/platform/mtk-mdp/Makefile
deleted file mode 100644 (file)
index 5982d65..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-mtk-mdp-y += mtk_mdp_core.o
-mtk-mdp-y += mtk_mdp_comp.o
-mtk-mdp-y += mtk_mdp_m2m.o
-mtk-mdp-y += mtk_mdp_regs.o
-mtk-mdp-y += mtk_mdp_vpu.o
-
-obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o
-
-ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
deleted file mode 100644 (file)
index 1e3833f..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2016 MediaTek Inc.
- * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-
-#include "mtk_mdp_comp.h"
-
-
-void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
-{
-       int i, err;
-
-       for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
-               if (IS_ERR(comp->clk[i]))
-                       continue;
-               err = clk_prepare_enable(comp->clk[i]);
-               if (err)
-                       dev_err(dev,
-                       "failed to enable clock, err %d. type:%d i:%d\n",
-                               err, comp->type, i);
-       }
-}
-
-void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
-               if (IS_ERR(comp->clk[i]))
-                       continue;
-               clk_disable_unprepare(comp->clk[i]);
-       }
-}
-
-int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
-                     struct mtk_mdp_comp *comp,
-                     enum mtk_mdp_comp_type comp_type)
-{
-       int ret;
-       int i;
-
-       comp->dev_node = of_node_get(node);
-       comp->type = comp_type;
-
-       for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
-               comp->clk[i] = of_clk_get(node, i);
-               if (IS_ERR(comp->clk[i])) {
-                       if (PTR_ERR(comp->clk[i]) != -EPROBE_DEFER)
-                               dev_err(dev, "Failed to get clock\n");
-                       ret = PTR_ERR(comp->clk[i]);
-                       goto put_dev;
-               }
-
-               /* Only RDMA needs two clocks */
-               if (comp->type != MTK_MDP_RDMA)
-                       break;
-       }
-
-       return 0;
-
-put_dev:
-       of_node_put(comp->dev_node);
-
-       return ret;
-}
-
-void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp)
-{
-       of_node_put(comp->dev_node);
-}
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
deleted file mode 100644 (file)
index ae41dd3..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2016 MediaTek Inc.
- * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#ifndef __MTK_MDP_COMP_H__
-#define __MTK_MDP_COMP_H__
-
-/**
- * enum mtk_mdp_comp_type - the MDP component
- * @MTK_MDP_RDMA:      Read DMA
- * @MTK_MDP_RSZ:       Riszer
- * @MTK_MDP_WDMA:      Write DMA
- * @MTK_MDP_WROT:      Write DMA with rotation
- */
-enum mtk_mdp_comp_type {
-       MTK_MDP_RDMA,
-       MTK_MDP_RSZ,
-       MTK_MDP_WDMA,
-       MTK_MDP_WROT,
-};
-
-/**
- * struct mtk_mdp_comp - the MDP's function component data
- * @node:      list node to track sibing MDP components
- * @dev_node:  component device node
- * @clk:       clocks required for component
- * @type:      component type
- */
-struct mtk_mdp_comp {
-       struct list_head        node;
-       struct device_node      *dev_node;
-       struct clk              *clk[2];
-       enum mtk_mdp_comp_type  type;
-};
-
-int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
-                     struct mtk_mdp_comp *comp,
-                     enum mtk_mdp_comp_type comp_type);
-void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp);
-void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp);
-void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp);
-
-
-#endif /* __MTK_MDP_COMP_H__ */
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
deleted file mode 100644 (file)
index d83c496..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015-2016 MediaTek Inc.
- * Author: Houlong Wei <houlong.wei@mediatek.com>
- *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/workqueue.h>
-
-#include "mtk_mdp_core.h"
-#include "mtk_mdp_m2m.h"
-#include "mtk_vpu.h"
-
-/* MDP debug log level (0-3). 3 shows all the logs. */
-int mtk_mdp_dbg_level;
-EXPORT_SYMBOL(mtk_mdp_dbg_level);
-
-module_param(mtk_mdp_dbg_level, int, 0644);
-
-static const struct of_device_id mtk_mdp_comp_dt_ids[] = {
-       {
-               .compatible = "mediatek,mt8173-mdp-rdma",
-               .data = (void *)MTK_MDP_RDMA
-       }, {
-               .compatible = "mediatek,mt8173-mdp-rsz",
-               .data = (void *)MTK_MDP_RSZ
-       }, {
-               .compatible = "mediatek,mt8173-mdp-wdma",
-               .data = (void *)MTK_MDP_WDMA
-       }, {
-               .compatible = "mediatek,mt8173-mdp-wrot",
-               .data = (void *)MTK_MDP_WROT
-       },
-       { },
-};
-
-static const struct of_device_id mtk_mdp_of_ids[] = {
-       { .compatible = "mediatek,mt8173-mdp", },
-       { },
-};
-MODULE_DEVICE_TABLE(of, mtk_mdp_of_ids);
-
-static void mtk_mdp_clock_on(struct mtk_mdp_dev *mdp)
-{
-       struct device *dev = &mdp->pdev->dev;
-       struct mtk_mdp_comp *comp_node;
-
-       list_for_each_entry(comp_node, &mdp->comp_list, node)
-               mtk_mdp_comp_clock_on(dev, comp_node);
-}
-
-static void mtk_mdp_clock_off(struct mtk_mdp_dev *mdp)
-{
-       struct device *dev = &mdp->pdev->dev;
-       struct mtk_mdp_comp *comp_node;
-
-       list_for_each_entry(comp_node, &mdp->comp_list, node)
-               mtk_mdp_comp_clock_off(dev, comp_node);
-}
-
-static void mtk_mdp_wdt_worker(struct work_struct *work)
-{
-       struct mtk_mdp_dev *mdp =
-                       container_of(work, struct mtk_mdp_dev, wdt_work);
-       struct mtk_mdp_ctx *ctx;
-
-       mtk_mdp_err("Watchdog timeout");
-
-       list_for_each_entry(ctx, &mdp->ctx_list, list) {
-               mtk_mdp_dbg(0, "[%d] Change as state error", ctx->id);
-               mtk_mdp_ctx_state_lock_set(ctx, MTK_MDP_CTX_ERROR);
-       }
-}
-
-static void mtk_mdp_reset_handler(void *priv)
-{
-       struct mtk_mdp_dev *mdp = priv;
-
-       queue_work(mdp->wdt_wq, &mdp->wdt_work);
-}
-
-void mtk_mdp_register_component(struct mtk_mdp_dev *mdp,
-                               struct mtk_mdp_comp *comp)
-{
-       list_add(&comp->node, &mdp->comp_list);
-}
-
-void mtk_mdp_unregister_component(struct mtk_mdp_dev *mdp,
-                                 struct mtk_mdp_comp *comp)
-{
-       list_del(&comp->node);
-}
-
-static int mtk_mdp_probe(struct platform_device *pdev)
-{
-       struct mtk_mdp_dev *mdp;
-       struct device *dev = &pdev->dev;
-       struct device_node *node, *parent;
-       struct mtk_mdp_comp *comp, *comp_temp;
-       int ret = 0;
-
-       mdp = devm_kzalloc(dev, sizeof(*mdp), GFP_KERNEL);
-       if (!mdp)
-               return -ENOMEM;
-
-       mdp->id = pdev->id;
-       mdp->pdev = pdev;
-       INIT_LIST_HEAD(&mdp->comp_list);
-       INIT_LIST_HEAD(&mdp->ctx_list);
-
-       mutex_init(&mdp->lock);
-       mutex_init(&mdp->vpulock);
-
-       /* Old dts had the components as child nodes */
-       node = of_get_next_child(dev->of_node, NULL);
-       if (node) {
-               of_node_put(node);
-               parent = dev->of_node;
-               dev_warn(dev, "device tree is out of date\n");
-       } else {
-               parent = dev->of_node->parent;
-       }
-
-       /* Iterate over sibling MDP function blocks */
-       for_each_child_of_node(parent, node) {
-               const struct of_device_id *of_id;
-               enum mtk_mdp_comp_type comp_type;
-
-               of_id = of_match_node(mtk_mdp_comp_dt_ids, node);
-               if (!of_id)
-                       continue;
-
-               if (!of_device_is_available(node)) {
-                       dev_err(dev, "Skipping disabled component %pOF\n",
-                               node);
-                       continue;
-               }
-
-               comp_type = (uintptr_t)of_id->data;
-
-               comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL);
-               if (!comp) {
-                       ret = -ENOMEM;
-                       of_node_put(node);
-                       goto err_comp;
-               }
-
-               ret = mtk_mdp_comp_init(dev, node, comp, comp_type);
-               if (ret) {
-                       of_node_put(node);
-                       goto err_comp;
-               }
-
-               mtk_mdp_register_component(mdp, comp);
-       }
-
-       mdp->job_wq = create_singlethread_workqueue(MTK_MDP_MODULE_NAME);
-       if (!mdp->job_wq) {
-               dev_err(&pdev->dev, "unable to alloc job workqueue\n");
-               ret = -ENOMEM;
-               goto err_alloc_job_wq;
-       }
-
-       mdp->wdt_wq = create_singlethread_workqueue("mdp_wdt_wq");
-       if (!mdp->wdt_wq) {
-               dev_err(&pdev->dev, "unable to alloc wdt workqueue\n");
-               ret = -ENOMEM;
-               goto err_alloc_wdt_wq;
-       }
-       INIT_WORK(&mdp->wdt_work, mtk_mdp_wdt_worker);
-
-       ret = v4l2_device_register(dev, &mdp->v4l2_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to register v4l2 device\n");
-               ret = -EINVAL;
-               goto err_dev_register;
-       }
-
-       ret = mtk_mdp_register_m2m_device(mdp);
-       if (ret) {
-               v4l2_err(&mdp->v4l2_dev, "Failed to init mem2mem device\n");
-               goto err_m2m_register;
-       }
-
-       mdp->vpu_dev = vpu_get_plat_device(pdev);
-       ret = vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp,
-                                 VPU_RST_MDP);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to register reset handler\n");
-               goto err_m2m_register;
-       }
-
-       platform_set_drvdata(pdev, mdp);
-
-       ret = vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to set vb2 dma mag seg size\n");
-               goto err_m2m_register;
-       }
-
-       pm_runtime_enable(dev);
-       dev_dbg(dev, "mdp-%d registered successfully\n", mdp->id);
-
-       return 0;
-
-err_m2m_register:
-       v4l2_device_unregister(&mdp->v4l2_dev);
-
-err_dev_register:
-       destroy_workqueue(mdp->wdt_wq);
-
-err_alloc_wdt_wq:
-       destroy_workqueue(mdp->job_wq);
-
-err_alloc_job_wq:
-
-err_comp:
-       list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) {
-               mtk_mdp_unregister_component(mdp, comp);
-               mtk_mdp_comp_deinit(dev, comp);
-       }
-
-       dev_dbg(dev, "err %d\n", ret);
-       return ret;
-}
-
-static int mtk_mdp_remove(struct platform_device *pdev)
-{
-       struct mtk_mdp_dev *mdp = platform_get_drvdata(pdev);
-       struct mtk_mdp_comp *comp, *comp_temp;
-
-       pm_runtime_disable(&pdev->dev);
-       vb2_dma_contig_clear_max_seg_size(&pdev->dev);
-       mtk_mdp_unregister_m2m_device(mdp);
-       v4l2_device_unregister(&mdp->v4l2_dev);
-
-       destroy_workqueue(mdp->wdt_wq);
-
-       destroy_workqueue(mdp->job_wq);
-
-       list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) {
-               mtk_mdp_unregister_component(mdp, comp);
-               mtk_mdp_comp_deinit(&pdev->dev, comp);
-       }
-
-       dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name);
-       return 0;
-}
-
-static int __maybe_unused mtk_mdp_pm_suspend(struct device *dev)
-{
-       struct mtk_mdp_dev *mdp = dev_get_drvdata(dev);
-
-       mtk_mdp_clock_off(mdp);
-
-       return 0;
-}
-
-static int __maybe_unused mtk_mdp_pm_resume(struct device *dev)
-{
-       struct mtk_mdp_dev *mdp = dev_get_drvdata(dev);
-
-       mtk_mdp_clock_on(mdp);
-
-       return 0;
-}
-
-static int __maybe_unused mtk_mdp_suspend(struct device *dev)
-{
-       if (pm_runtime_suspended(dev))
-               return 0;
-
-       return mtk_mdp_pm_suspend(dev);
-}
-
-static int __maybe_unused mtk_mdp_resume(struct device *dev)
-{
-       if (pm_runtime_suspended(dev))
-               return 0;
-
-       return mtk_mdp_pm_resume(dev);
-}
-
-static const struct dev_pm_ops mtk_mdp_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(mtk_mdp_suspend, mtk_mdp_resume)
-       SET_RUNTIME_PM_OPS(mtk_mdp_pm_suspend, mtk_mdp_pm_resume, NULL)
-};
-
-static struct platform_driver mtk_mdp_driver = {
-       .probe          = mtk_mdp_probe,
-       .remove         = mtk_mdp_remove,
-       .driver = {
-               .name   = MTK_MDP_MODULE_NAME,
-               .pm     = &mtk_mdp_pm_ops,
-               .of_match_table = mtk_mdp_of_ids,
-       }
-};
-
-module_platform_driver(mtk_mdp_driver);
-
-MODULE_AUTHOR("Houlong Wei <houlong.wei@mediatek.com>");
-MODULE_DESCRIPTION("Mediatek image processor driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mtk-mdp/mtk_mdp_core.h
deleted file mode 100644 (file)
index a6e6dc3..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2015-2016 MediaTek Inc.
- * Author: Houlong Wei <houlong.wei@mediatek.com>
- *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#ifndef __MTK_MDP_CORE_H__
-#define __MTK_MDP_CORE_H__
-
-#include <linux/videodev2.h>
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-device.h>
-#include <media/v4l2-mem2mem.h>
-#include <media/videobuf2-core.h>
-#include <media/videobuf2-dma-contig.h>
-
-#include "mtk_mdp_vpu.h"
-#include "mtk_mdp_comp.h"
-
-
-#define MTK_MDP_MODULE_NAME            "mtk-mdp"
-
-#define MTK_MDP_SHUTDOWN_TIMEOUT       ((100*HZ)/1000) /* 100ms */
-#define MTK_MDP_MAX_CTRL_NUM           10
-
-#define MTK_MDP_FMT_FLAG_OUTPUT                BIT(0)
-#define MTK_MDP_FMT_FLAG_CAPTURE       BIT(1)
-
-#define MTK_MDP_VPU_INIT               BIT(0)
-#define MTK_MDP_CTX_ERROR              BIT(5)
-
-/**
- *  struct mtk_mdp_pix_align - alignment of image
- *  @org_w: source alignment of width
- *  @org_h: source alignment of height
- *  @target_w: dst alignment of width
- *  @target_h: dst alignment of height
- */
-struct mtk_mdp_pix_align {
-       u16 org_w;
-       u16 org_h;
-       u16 target_w;
-       u16 target_h;
-};
-
-/**
- * struct mtk_mdp_fmt - the driver's internal color format data
- * @pixelformat: the fourcc code for this format, 0 if not applicable
- * @num_planes: number of physically non-contiguous data planes
- * @num_comp: number of logical data planes
- * @depth: per plane driver's private 'number of bits per pixel'
- * @row_depth: per plane driver's private 'number of bits per pixel per row'
- * @flags: flags indicating which operation mode format applies to
- *        MTK_MDP_FMT_FLAG_OUTPUT is used in OUTPUT stream
- *        MTK_MDP_FMT_FLAG_CAPTURE is used in CAPTURE stream
- * @align: pointer to a pixel alignment struct, NULL if using default value
- */
-struct mtk_mdp_fmt {
-       u32     pixelformat;
-       u16     num_planes;
-       u16     num_comp;
-       u8      depth[VIDEO_MAX_PLANES];
-       u8      row_depth[VIDEO_MAX_PLANES];
-       u32     flags;
-       struct mtk_mdp_pix_align *align;
-};
-
-/**
- * struct mtk_mdp_addr - the image processor physical address set
- * @addr:      address of planes
- */
-struct mtk_mdp_addr {
-       dma_addr_t addr[MTK_MDP_MAX_NUM_PLANE];
-};
-
-/* struct mtk_mdp_ctrls - the image processor control set
- * @rotate: rotation degree
- * @hflip: horizontal flip
- * @vflip: vertical flip
- * @global_alpha: the alpha value of current frame
- */
-struct mtk_mdp_ctrls {
-       struct v4l2_ctrl *rotate;
-       struct v4l2_ctrl *hflip;
-       struct v4l2_ctrl *vflip;
-       struct v4l2_ctrl *global_alpha;
-};
-
-/**
- * struct mtk_mdp_frame - source/target frame properties
- * @width:     SRC : SRCIMG_WIDTH, DST : OUTPUTDMA_WHOLE_IMG_WIDTH
- * @height:    SRC : SRCIMG_HEIGHT, DST : OUTPUTDMA_WHOLE_IMG_HEIGHT
- * @crop:      cropped(source)/scaled(destination) size
- * @payload:   image size in bytes (w x h x bpp)
- * @pitch:     bytes per line of image in memory
- * @addr:      image frame buffer physical addresses
- * @fmt:       color format pointer
- * @alpha:     frame's alpha value
- */
-struct mtk_mdp_frame {
-       u32                             width;
-       u32                             height;
-       struct v4l2_rect                crop;
-       unsigned long                   payload[VIDEO_MAX_PLANES];
-       unsigned int                    pitch[VIDEO_MAX_PLANES];
-       struct mtk_mdp_addr             addr;
-       const struct mtk_mdp_fmt        *fmt;
-       u8                              alpha;
-};
-
-/**
- * struct mtk_mdp_variant - image processor variant information
- * @pix_max:           maximum limit of image size
- * @pix_min:           minimum limit of image size
- * @pix_align:         alignment of image
- * @h_scale_up_max:    maximum scale-up in horizontal
- * @v_scale_up_max:    maximum scale-up in vertical
- * @h_scale_down_max:  maximum scale-down in horizontal
- * @v_scale_down_max:  maximum scale-down in vertical
- */
-struct mtk_mdp_variant {
-       struct mtk_mdp_pix_limit        *pix_max;
-       struct mtk_mdp_pix_limit        *pix_min;
-       struct mtk_mdp_pix_align        *pix_align;
-       u16                             h_scale_up_max;
-       u16                             v_scale_up_max;
-       u16                             h_scale_down_max;
-       u16                             v_scale_down_max;
-};
-
-/**
- * struct mtk_mdp_dev - abstraction for image processor entity
- * @lock:      the mutex protecting this data structure
- * @vpulock:   the mutex protecting the communication with VPU
- * @pdev:      pointer to the image processor platform device
- * @variant:   the IP variant information
- * @id:                image processor device index (0..MTK_MDP_MAX_DEVS)
- * @comp_list: list of MDP function components
- * @m2m_dev:   v4l2 memory-to-memory device data
- * @ctx_list:  list of struct mtk_mdp_ctx
- * @vdev:      video device for image processor driver
- * @v4l2_dev:  V4L2 device to register video devices for.
- * @job_wq:    processor work queue
- * @vpu_dev:   VPU platform device
- * @ctx_num:   counter of active MTK MDP context
- * @id_counter:        An integer id given to the next opened context
- * @wdt_wq:    work queue for VPU watchdog
- * @wdt_work:  worker for VPU watchdog
- */
-struct mtk_mdp_dev {
-       struct mutex                    lock;
-       struct mutex                    vpulock;
-       struct platform_device          *pdev;
-       struct mtk_mdp_variant          *variant;
-       u16                             id;
-       struct list_head                comp_list;
-       struct v4l2_m2m_dev             *m2m_dev;
-       struct list_head                ctx_list;
-       struct video_device             *vdev;
-       struct v4l2_device              v4l2_dev;
-       struct workqueue_struct         *job_wq;
-       struct platform_device          *vpu_dev;
-       int                             ctx_num;
-       unsigned long                   id_counter;
-       struct workqueue_struct         *wdt_wq;
-       struct work_struct              wdt_work;
-};
-
-/**
- * struct mtk_mdp_ctx - the device context data
- * @list:              link to ctx_list of mtk_mdp_dev
- * @s_frame:           source frame properties
- * @d_frame:           destination frame properties
- * @id:                        index of the context that this structure describes
- * @flags:             additional flags for image conversion
- * @state:             flags to keep track of user configuration
- *                     Protected by slock
- * @rotation:          rotates the image by specified angle
- * @hflip:             mirror the picture horizontally
- * @vflip:             mirror the picture vertically
- * @mdp_dev:           the image processor device this context applies to
- * @m2m_ctx:           memory-to-memory device context
- * @fh:                        v4l2 file handle
- * @ctrl_handler:      v4l2 controls handler
- * @ctrls:             image processor control set
- * @ctrls_rdy:         true if the control handler is initialized
- * @colorspace:                enum v4l2_colorspace; supplemental to pixelformat
- * @ycbcr_enc:         enum v4l2_ycbcr_encoding, Y'CbCr encoding
- * @xfer_func:         enum v4l2_xfer_func, colorspace transfer function
- * @quant:             enum v4l2_quantization, colorspace quantization
- * @vpu:               VPU instance
- * @slock:             the mutex protecting mtp_mdp_ctx.state
- * @work:              worker for image processing
- */
-struct mtk_mdp_ctx {
-       struct list_head                list;
-       struct mtk_mdp_frame            s_frame;
-       struct mtk_mdp_frame            d_frame;
-       u32                             flags;
-       u32                             state;
-       int                             id;
-       int                             rotation;
-       u32                             hflip:1;
-       u32                             vflip:1;
-       struct mtk_mdp_dev              *mdp_dev;
-       struct v4l2_m2m_ctx             *m2m_ctx;
-       struct v4l2_fh                  fh;
-       struct v4l2_ctrl_handler        ctrl_handler;
-       struct mtk_mdp_ctrls            ctrls;
-       bool                            ctrls_rdy;
-       enum v4l2_colorspace            colorspace;
-       enum v4l2_ycbcr_encoding        ycbcr_enc;
-       enum v4l2_xfer_func             xfer_func;
-       enum v4l2_quantization          quant;
-
-       struct mtk_mdp_vpu              vpu;
-       struct mutex                    slock;
-       struct work_struct              work;
-};
-
-extern int mtk_mdp_dbg_level;
-
-void mtk_mdp_register_component(struct mtk_mdp_dev *mdp,
-                               struct mtk_mdp_comp *comp);
-
-void mtk_mdp_unregister_component(struct mtk_mdp_dev *mdp,
-                                 struct mtk_mdp_comp *comp);
-
-#if defined(DEBUG)
-
-#define mtk_mdp_dbg(level, fmt, args...)                                \
-       do {                                                             \
-               if (mtk_mdp_dbg_level >= level)                          \
-                       pr_info("[MTK_MDP] level=%d %s(),%d: " fmt "\n", \
-                               level, __func__, __LINE__, ##args);      \
-       } while (0)
-
-#define mtk_mdp_err(fmt, args...)                                      \
-       pr_err("[MTK_MDP][ERROR] %s:%d: " fmt "\n", __func__, __LINE__, \
-              ##args)
-
-
-#define mtk_mdp_dbg_enter()  mtk_mdp_dbg(3, "+")
-#define mtk_mdp_dbg_leave()  mtk_mdp_dbg(3, "-")
-
-#else
-
-#define mtk_mdp_dbg(level, fmt, args...) {}
-#define mtk_mdp_err(fmt, args...)
-#define mtk_mdp_dbg_enter()
-#define mtk_mdp_dbg_leave()
-
-#endif
-
-#endif /* __MTK_MDP_CORE_H__ */
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
deleted file mode 100644 (file)
index 2cb8cec..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2015-2016 MediaTek Inc.
- * Author: Houlong Wei <houlong.wei@mediatek.com>
- *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#ifndef __MTK_MDP_IPI_H__
-#define __MTK_MDP_IPI_H__
-
-#define MTK_MDP_MAX_NUM_PLANE          3
-
-enum mdp_ipi_msgid {
-       AP_MDP_INIT             = 0xd000,
-       AP_MDP_DEINIT           = 0xd001,
-       AP_MDP_PROCESS          = 0xd002,
-
-       VPU_MDP_INIT_ACK        = 0xe000,
-       VPU_MDP_DEINIT_ACK      = 0xe001,
-       VPU_MDP_PROCESS_ACK     = 0xe002
-};
-
-#pragma pack(push, 4)
-
-/**
- * struct mdp_ipi_init - for AP_MDP_INIT
- * @msg_id   : AP_MDP_INIT
- * @ipi_id   : IPI_MDP
- * @ap_inst  : AP mtk_mdp_vpu address
- */
-struct mdp_ipi_init {
-       uint32_t msg_id;
-       uint32_t ipi_id;
-       uint64_t ap_inst;
-};
-
-/**
- * struct mdp_ipi_comm - for AP_MDP_PROCESS, AP_MDP_DEINIT
- * @msg_id        : AP_MDP_PROCESS, AP_MDP_DEINIT
- * @ipi_id        : IPI_MDP
- * @ap_inst       : AP mtk_mdp_vpu address
- * @vpu_inst_addr : VPU MDP instance address
- */
-struct mdp_ipi_comm {
-       uint32_t msg_id;
-       uint32_t ipi_id;
-       uint64_t ap_inst;
-       uint32_t vpu_inst_addr;
-};
-
-/**
- * struct mdp_ipi_comm_ack - for VPU_MDP_DEINIT_ACK, VPU_MDP_PROCESS_ACK
- * @msg_id        : VPU_MDP_DEINIT_ACK, VPU_MDP_PROCESS_ACK
- * @ipi_id        : IPI_MDP
- * @ap_inst       : AP mtk_mdp_vpu address
- * @vpu_inst_addr : VPU MDP instance address
- * @status        : VPU exeuction result
- */
-struct mdp_ipi_comm_ack {
-       uint32_t msg_id;
-       uint32_t ipi_id;
-       uint64_t ap_inst;
-       uint32_t vpu_inst_addr;
-       int32_t status;
-};
-
-/**
- * struct mdp_config - configured for source/destination image
- * @x        : left
- * @y        : top
- * @w        : width
- * @h        : height
- * @w_stride : bytes in horizontal
- * @h_stride : bytes in vertical
- * @crop_x   : cropped left
- * @crop_y   : cropped top
- * @crop_w   : cropped width
- * @crop_h   : cropped height
- * @format   : color format
- */
-struct mdp_config {
-       int32_t x;
-       int32_t y;
-       int32_t w;
-       int32_t h;
-       int32_t w_stride;
-       int32_t h_stride;
-       int32_t crop_x;
-       int32_t crop_y;
-       int32_t crop_w;
-       int32_t crop_h;
-       int32_t format;
-};
-
-struct mdp_buffer {
-       uint64_t addr_mva[MTK_MDP_MAX_NUM_PLANE];
-       int32_t plane_size[MTK_MDP_MAX_NUM_PLANE];
-       int32_t plane_num;
-};
-
-struct mdp_config_misc {
-       int32_t orientation; /* 0, 90, 180, 270 */
-       int32_t hflip; /* 1 will enable the flip */
-       int32_t vflip; /* 1 will enable the flip */
-       int32_t alpha; /* global alpha */
-};
-
-struct mdp_process_vsi {
-       struct mdp_config src_config;
-       struct mdp_buffer src_buffer;
-       struct mdp_config dst_config;
-       struct mdp_buffer dst_buffer;
-       struct mdp_config_misc misc;
-};
-
-#pragma pack(pop)
-
-#endif /* __MTK_MDP_IPI_H__ */
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
deleted file mode 100644 (file)
index f14779e..0000000
+++ /dev/null
@@ -1,1229 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015-2016 MediaTek Inc.
- * Author: Houlong Wei <houlong.wei@mediatek.com>
- *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#include <linux/device.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/pm_runtime.h>
-#include <linux/slab.h>
-#include <linux/workqueue.h>
-#include <media/v4l2-event.h>
-#include <media/v4l2-ioctl.h>
-
-#include "mtk_mdp_core.h"
-#include "mtk_mdp_m2m.h"
-#include "mtk_mdp_regs.h"
-#include "mtk_vpu.h"
-
-
-/**
- *  struct mtk_mdp_pix_limit - image pixel size limits
- *  @org_w: source pixel width
- *  @org_h: source pixel height
- *  @target_rot_dis_w: pixel dst scaled width with the rotator is off
- *  @target_rot_dis_h: pixel dst scaled height with the rotator is off
- *  @target_rot_en_w: pixel dst scaled width with the rotator is on
- *  @target_rot_en_h: pixel dst scaled height with the rotator is on
- */
-struct mtk_mdp_pix_limit {
-       u16 org_w;
-       u16 org_h;
-       u16 target_rot_dis_w;
-       u16 target_rot_dis_h;
-       u16 target_rot_en_w;
-       u16 target_rot_en_h;
-};
-
-static struct mtk_mdp_pix_align mtk_mdp_size_align = {
-       .org_w                  = 16,
-       .org_h                  = 16,
-       .target_w               = 2,
-       .target_h               = 2,
-};
-
-static const struct mtk_mdp_fmt mtk_mdp_formats[] = {
-       {
-               .pixelformat    = V4L2_PIX_FMT_MT21C,
-               .depth          = { 8, 4 },
-               .row_depth      = { 8, 8 },
-               .num_planes     = 2,
-               .num_comp       = 2,
-               .align          = &mtk_mdp_size_align,
-               .flags          = MTK_MDP_FMT_FLAG_OUTPUT,
-       }, {
-               .pixelformat    = V4L2_PIX_FMT_NV12M,
-               .depth          = { 8, 4 },
-               .row_depth      = { 8, 8 },
-               .num_planes     = 2,
-               .num_comp       = 2,
-               .flags          = MTK_MDP_FMT_FLAG_OUTPUT |
-                                 MTK_MDP_FMT_FLAG_CAPTURE,
-       }, {
-               .pixelformat    = V4L2_PIX_FMT_YUV420M,
-               .depth          = { 8, 2, 2 },
-               .row_depth      = { 8, 4, 4 },
-               .num_planes     = 3,
-               .num_comp       = 3,
-               .flags          = MTK_MDP_FMT_FLAG_OUTPUT |
-                                 MTK_MDP_FMT_FLAG_CAPTURE,
-       }, {
-               .pixelformat    = V4L2_PIX_FMT_YVU420,
-               .depth          = { 12 },
-               .row_depth      = { 8 },
-               .num_planes     = 1,
-               .num_comp       = 3,
-               .flags          = MTK_MDP_FMT_FLAG_OUTPUT |
-                                 MTK_MDP_FMT_FLAG_CAPTURE,
-       }
-};
-
-static struct mtk_mdp_pix_limit mtk_mdp_size_max = {
-       .target_rot_dis_w       = 4096,
-       .target_rot_dis_h       = 4096,
-       .target_rot_en_w        = 4096,
-       .target_rot_en_h        = 4096,
-};
-
-static struct mtk_mdp_pix_limit mtk_mdp_size_min = {
-       .org_w                  = 16,
-       .org_h                  = 16,
-       .target_rot_dis_w       = 16,
-       .target_rot_dis_h       = 16,
-       .target_rot_en_w        = 16,
-       .target_rot_en_h        = 16,
-};
-
-/* align size for normal raster scan pixel format */
-static struct mtk_mdp_pix_align mtk_mdp_rs_align = {
-       .org_w                  = 2,
-       .org_h                  = 2,
-       .target_w               = 2,
-       .target_h               = 2,
-};
-
-static struct mtk_mdp_variant mtk_mdp_default_variant = {
-       .pix_max                = &mtk_mdp_size_max,
-       .pix_min                = &mtk_mdp_size_min,
-       .pix_align              = &mtk_mdp_rs_align,
-       .h_scale_up_max         = 32,
-       .v_scale_up_max         = 32,
-       .h_scale_down_max       = 32,
-       .v_scale_down_max       = 128,
-};
-
-static const struct mtk_mdp_fmt *mtk_mdp_find_fmt(u32 pixelformat, u32 type)
-{
-       u32 i, flag;
-
-       flag = V4L2_TYPE_IS_OUTPUT(type) ? MTK_MDP_FMT_FLAG_OUTPUT :
-                                          MTK_MDP_FMT_FLAG_CAPTURE;
-
-       for (i = 0; i < ARRAY_SIZE(mtk_mdp_formats); ++i) {
-               if (!(mtk_mdp_formats[i].flags & flag))
-                       continue;
-               if (mtk_mdp_formats[i].pixelformat == pixelformat)
-                       return &mtk_mdp_formats[i];
-       }
-       return NULL;
-}
-
-static const struct mtk_mdp_fmt *mtk_mdp_find_fmt_by_index(u32 index, u32 type)
-{
-       u32 i, flag, num = 0;
-
-       flag = V4L2_TYPE_IS_OUTPUT(type) ? MTK_MDP_FMT_FLAG_OUTPUT :
-                                          MTK_MDP_FMT_FLAG_CAPTURE;
-
-       for (i = 0; i < ARRAY_SIZE(mtk_mdp_formats); ++i) {
-               if (!(mtk_mdp_formats[i].flags & flag))
-                       continue;
-               if (index == num)
-                       return &mtk_mdp_formats[i];
-               num++;
-       }
-       return NULL;
-}
-
-static void mtk_mdp_bound_align_image(u32 *w, unsigned int wmin,
-                                     unsigned int wmax, unsigned int align_w,
-                                     u32 *h, unsigned int hmin,
-                                     unsigned int hmax, unsigned int align_h)
-{
-       int org_w, org_h, step_w, step_h;
-       int walign, halign;
-
-       org_w = *w;
-       org_h = *h;
-       walign = ffs(align_w) - 1;
-       halign = ffs(align_h) - 1;
-       v4l_bound_align_image(w, wmin, wmax, walign, h, hmin, hmax, halign, 0);
-
-       step_w = 1 << walign;
-       step_h = 1 << halign;
-       if (*w < org_w && (*w + step_w) <= wmax)
-               *w += step_w;
-       if (*h < org_h && (*h + step_h) <= hmax)
-               *h += step_h;
-}
-
-static const struct mtk_mdp_fmt *mtk_mdp_try_fmt_mplane(struct mtk_mdp_ctx *ctx,
-                                                       struct v4l2_format *f)
-{
-       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
-       struct mtk_mdp_variant *variant = mdp->variant;
-       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
-       const struct mtk_mdp_fmt *fmt;
-       u32 max_w, max_h, align_w, align_h;
-       u32 min_w, min_h, org_w, org_h;
-       int i;
-
-       fmt = mtk_mdp_find_fmt(pix_mp->pixelformat, f->type);
-       if (!fmt)
-               fmt = mtk_mdp_find_fmt_by_index(0, f->type);
-       if (!fmt) {
-               dev_dbg(&ctx->mdp_dev->pdev->dev,
-                       "pixelformat format 0x%X invalid\n",
-                       pix_mp->pixelformat);
-               return NULL;
-       }
-
-       pix_mp->field = V4L2_FIELD_NONE;
-       pix_mp->pixelformat = fmt->pixelformat;
-       if (V4L2_TYPE_IS_CAPTURE(f->type)) {
-               pix_mp->colorspace = ctx->colorspace;
-               pix_mp->xfer_func = ctx->xfer_func;
-               pix_mp->ycbcr_enc = ctx->ycbcr_enc;
-               pix_mp->quantization = ctx->quant;
-       }
-
-       max_w = variant->pix_max->target_rot_dis_w;
-       max_h = variant->pix_max->target_rot_dis_h;
-
-       if (fmt->align == NULL) {
-               /* use default alignment */
-               align_w = variant->pix_align->org_w;
-               align_h = variant->pix_align->org_h;
-       } else {
-               align_w = fmt->align->org_w;
-               align_h = fmt->align->org_h;
-       }
-
-       if (V4L2_TYPE_IS_OUTPUT(f->type)) {
-               min_w = variant->pix_min->org_w;
-               min_h = variant->pix_min->org_h;
-       } else {
-               min_w = variant->pix_min->target_rot_dis_w;
-               min_h = variant->pix_min->target_rot_dis_h;
-       }
-
-       mtk_mdp_dbg(2, "[%d] type:%d, wxh:%ux%u, align:%ux%u, max:%ux%u",
-                   ctx->id, f->type, pix_mp->width, pix_mp->height,
-                   align_w, align_h, max_w, max_h);
-       /*
-        * To check if image size is modified to adjust parameter against
-        * hardware abilities
-        */
-       org_w = pix_mp->width;
-       org_h = pix_mp->height;
-
-       mtk_mdp_bound_align_image(&pix_mp->width, min_w, max_w, align_w,
-                                 &pix_mp->height, min_h, max_h, align_h);
-
-       if (org_w != pix_mp->width || org_h != pix_mp->height)
-               mtk_mdp_dbg(1, "[%d] size change:%ux%u to %ux%u", ctx->id,
-                           org_w, org_h, pix_mp->width, pix_mp->height);
-       pix_mp->num_planes = fmt->num_planes;
-
-       for (i = 0; i < pix_mp->num_planes; ++i) {
-               int bpl = (pix_mp->width * fmt->row_depth[i]) / 8;
-               int sizeimage = (pix_mp->width * pix_mp->height *
-                       fmt->depth[i]) / 8;
-
-               pix_mp->plane_fmt[i].bytesperline = bpl;
-               if (pix_mp->plane_fmt[i].sizeimage < sizeimage)
-                       pix_mp->plane_fmt[i].sizeimage = sizeimage;
-               mtk_mdp_dbg(2, "[%d] p%d, bpl:%d, sizeimage:%u (%u)", ctx->id,
-                           i, bpl, pix_mp->plane_fmt[i].sizeimage, sizeimage);
-       }
-
-       return fmt;
-}
-
-static struct mtk_mdp_frame *mtk_mdp_ctx_get_frame(struct mtk_mdp_ctx *ctx,
-                                           enum v4l2_buf_type type)
-{
-       if (V4L2_TYPE_IS_OUTPUT(type))
-               return &ctx->s_frame;
-       return &ctx->d_frame;
-}
-
-static void mtk_mdp_check_crop_change(u32 new_w, u32 new_h, u32 *w, u32 *h)
-{
-       if (new_w != *w || new_h != *h) {
-               mtk_mdp_dbg(1, "size change:%dx%d to %dx%d",
-                           *w, *h, new_w, new_h);
-
-               *w = new_w;
-               *h = new_h;
-       }
-}
-
-static int mtk_mdp_try_crop(struct mtk_mdp_ctx *ctx, u32 type,
-                           struct v4l2_rect *r)
-{
-       struct mtk_mdp_frame *frame;
-       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
-       struct mtk_mdp_variant *variant = mdp->variant;
-       u32 align_w, align_h, new_w, new_h;
-       u32 min_w, min_h, max_w, max_h;
-
-       if (r->top < 0 || r->left < 0) {
-               dev_err(&ctx->mdp_dev->pdev->dev,
-                       "doesn't support negative values for top & left\n");
-               return -EINVAL;
-       }
-
-       mtk_mdp_dbg(2, "[%d] type:%d, set wxh:%dx%d", ctx->id, type,
-                   r->width, r->height);
-
-       frame = mtk_mdp_ctx_get_frame(ctx, type);
-       max_w = frame->width;
-       max_h = frame->height;
-       new_w = r->width;
-       new_h = r->height;
-
-       if (V4L2_TYPE_IS_OUTPUT(type)) {
-               align_w = 1;
-               align_h = 1;
-               min_w = 64;
-               min_h = 32;
-       } else {
-               align_w = variant->pix_align->target_w;
-               align_h = variant->pix_align->target_h;
-               if (ctx->ctrls.rotate->val == 90 ||
-                   ctx->ctrls.rotate->val == 270) {
-                       max_w = frame->height;
-                       max_h = frame->width;
-                       min_w = variant->pix_min->target_rot_en_w;
-                       min_h = variant->pix_min->target_rot_en_h;
-                       new_w = r->height;
-                       new_h = r->width;
-               } else {
-                       min_w = variant->pix_min->target_rot_dis_w;
-                       min_h = variant->pix_min->target_rot_dis_h;
-               }
-       }
-
-       mtk_mdp_dbg(2, "[%d] align:%dx%d, min:%dx%d, new:%dx%d", ctx->id,
-                   align_w, align_h, min_w, min_h, new_w, new_h);
-
-       mtk_mdp_bound_align_image(&new_w, min_w, max_w, align_w,
-                                 &new_h, min_h, max_h, align_h);
-
-       if (V4L2_TYPE_IS_CAPTURE(type) &&
-           (ctx->ctrls.rotate->val == 90 || ctx->ctrls.rotate->val == 270))
-               mtk_mdp_check_crop_change(new_h, new_w,
-                                         &r->width, &r->height);
-       else
-               mtk_mdp_check_crop_change(new_w, new_h,
-                                         &r->width, &r->height);
-
-       /* adjust left/top if cropping rectangle is out of bounds */
-       /* Need to add code to algin left value with 2's multiple */
-       if (r->left + new_w > max_w)
-               r->left = max_w - new_w;
-       if (r->top + new_h > max_h)
-               r->top = max_h - new_h;
-
-       if (r->left & 1)
-               r->left -= 1;
-
-       mtk_mdp_dbg(2, "[%d] crop l,t,w,h:%d,%d,%d,%d, max:%dx%d", ctx->id,
-                   r->left, r->top, r->width,
-                   r->height, max_w, max_h);
-       return 0;
-}
-
-static inline struct mtk_mdp_ctx *fh_to_ctx(struct v4l2_fh *fh)
-{
-       return container_of(fh, struct mtk_mdp_ctx, fh);
-}
-
-static inline struct mtk_mdp_ctx *ctrl_to_ctx(struct v4l2_ctrl *ctrl)
-{
-       return container_of(ctrl->handler, struct mtk_mdp_ctx, ctrl_handler);
-}
-
-void mtk_mdp_ctx_state_lock_set(struct mtk_mdp_ctx *ctx, u32 state)
-{
-       mutex_lock(&ctx->slock);
-       ctx->state |= state;
-       mutex_unlock(&ctx->slock);
-}
-
-static bool mtk_mdp_ctx_state_is_set(struct mtk_mdp_ctx *ctx, u32 mask)
-{
-       bool ret;
-
-       mutex_lock(&ctx->slock);
-       ret = (ctx->state & mask) == mask;
-       mutex_unlock(&ctx->slock);
-       return ret;
-}
-
-static void mtk_mdp_set_frame_size(struct mtk_mdp_frame *frame, int width,
-                                  int height)
-{
-       frame->width = width;
-       frame->height = height;
-       frame->crop.width = width;
-       frame->crop.height = height;
-       frame->crop.left = 0;
-       frame->crop.top = 0;
-}
-
-static int mtk_mdp_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
-{
-       struct mtk_mdp_ctx *ctx = q->drv_priv;
-       int ret;
-
-       ret = pm_runtime_resume_and_get(&ctx->mdp_dev->pdev->dev);
-       if (ret < 0)
-               mtk_mdp_dbg(1, "[%d] pm_runtime_resume_and_get failed:%d",
-                           ctx->id, ret);
-
-       return ret;
-}
-
-static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx,
-                                   enum v4l2_buf_type type)
-{
-       if (V4L2_TYPE_IS_OUTPUT(type))
-               return v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
-       else
-               return v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
-}
-
-static void mtk_mdp_m2m_stop_streaming(struct vb2_queue *q)
-{
-       struct mtk_mdp_ctx *ctx = q->drv_priv;
-       struct vb2_buffer *vb;
-
-       vb = mtk_mdp_m2m_buf_remove(ctx, q->type);
-       while (vb != NULL) {
-               v4l2_m2m_buf_done(to_vb2_v4l2_buffer(vb), VB2_BUF_STATE_ERROR);
-               vb = mtk_mdp_m2m_buf_remove(ctx, q->type);
-       }
-
-       pm_runtime_put(&ctx->mdp_dev->pdev->dev);
-}
-
-/* The color format (num_planes) must be already configured. */
-static void mtk_mdp_prepare_addr(struct mtk_mdp_ctx *ctx,
-                                struct vb2_buffer *vb,
-                                struct mtk_mdp_frame *frame,
-                                struct mtk_mdp_addr *addr)
-{
-       u32 pix_size, planes, i;
-
-       pix_size = frame->width * frame->height;
-       planes = min_t(u32, frame->fmt->num_planes, ARRAY_SIZE(addr->addr));
-       for (i = 0; i < planes; i++)
-               addr->addr[i] = vb2_dma_contig_plane_dma_addr(vb, i);
-
-       if (planes == 1) {
-               if (frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420) {
-                       addr->addr[1] = (dma_addr_t)(addr->addr[0] + pix_size);
-                       addr->addr[2] = (dma_addr_t)(addr->addr[1] +
-                                       (pix_size >> 2));
-               } else {
-                       dev_err(&ctx->mdp_dev->pdev->dev,
-                               "Invalid pixelformat:0x%x\n",
-                               frame->fmt->pixelformat);
-               }
-       }
-       mtk_mdp_dbg(3, "[%d] planes:%d, size:%d, addr:%p,%p,%p",
-                   ctx->id, planes, pix_size, (void *)addr->addr[0],
-                   (void *)addr->addr[1], (void *)addr->addr[2]);
-}
-
-static void mtk_mdp_m2m_get_bufs(struct mtk_mdp_ctx *ctx)
-{
-       struct mtk_mdp_frame *s_frame, *d_frame;
-       struct vb2_v4l2_buffer *src_vbuf, *dst_vbuf;
-
-       s_frame = &ctx->s_frame;
-       d_frame = &ctx->d_frame;
-
-       src_vbuf = v4l2_m2m_next_src_buf(ctx->m2m_ctx);
-       mtk_mdp_prepare_addr(ctx, &src_vbuf->vb2_buf, s_frame, &s_frame->addr);
-
-       dst_vbuf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
-       mtk_mdp_prepare_addr(ctx, &dst_vbuf->vb2_buf, d_frame, &d_frame->addr);
-
-       dst_vbuf->vb2_buf.timestamp = src_vbuf->vb2_buf.timestamp;
-}
-
-static void mtk_mdp_process_done(void *priv, int vb_state)
-{
-       struct mtk_mdp_dev *mdp = priv;
-       struct mtk_mdp_ctx *ctx;
-       struct vb2_v4l2_buffer *src_vbuf, *dst_vbuf;
-
-       ctx = v4l2_m2m_get_curr_priv(mdp->m2m_dev);
-       if (!ctx)
-               return;
-
-       src_vbuf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
-       dst_vbuf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
-
-       dst_vbuf->vb2_buf.timestamp = src_vbuf->vb2_buf.timestamp;
-       dst_vbuf->timecode = src_vbuf->timecode;
-       dst_vbuf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-       dst_vbuf->flags |= src_vbuf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-
-       v4l2_m2m_buf_done(src_vbuf, vb_state);
-       v4l2_m2m_buf_done(dst_vbuf, vb_state);
-       v4l2_m2m_job_finish(ctx->mdp_dev->m2m_dev, ctx->m2m_ctx);
-}
-
-static void mtk_mdp_m2m_worker(struct work_struct *work)
-{
-       struct mtk_mdp_ctx *ctx =
-                               container_of(work, struct mtk_mdp_ctx, work);
-       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
-       enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
-       int ret;
-
-       if (mtk_mdp_ctx_state_is_set(ctx, MTK_MDP_CTX_ERROR)) {
-               dev_err(&mdp->pdev->dev, "ctx is in error state");
-               goto worker_end;
-       }
-
-       mtk_mdp_m2m_get_bufs(ctx);
-
-       mtk_mdp_hw_set_input_addr(ctx, &ctx->s_frame.addr);
-       mtk_mdp_hw_set_output_addr(ctx, &ctx->d_frame.addr);
-
-       mtk_mdp_hw_set_in_size(ctx);
-       mtk_mdp_hw_set_in_image_format(ctx);
-
-       mtk_mdp_hw_set_out_size(ctx);
-       mtk_mdp_hw_set_out_image_format(ctx);
-
-       mtk_mdp_hw_set_rotation(ctx);
-       mtk_mdp_hw_set_global_alpha(ctx);
-
-       ret = mtk_mdp_vpu_process(&ctx->vpu);
-       if (ret) {
-               dev_err(&mdp->pdev->dev, "processing failed: %d", ret);
-               goto worker_end;
-       }
-
-       buf_state = VB2_BUF_STATE_DONE;
-
-worker_end:
-       mtk_mdp_process_done(mdp, buf_state);
-}
-
-static void mtk_mdp_m2m_device_run(void *priv)
-{
-       struct mtk_mdp_ctx *ctx = priv;
-
-       queue_work(ctx->mdp_dev->job_wq, &ctx->work);
-}
-
-static int mtk_mdp_m2m_queue_setup(struct vb2_queue *vq,
-                       unsigned int *num_buffers, unsigned int *num_planes,
-                       unsigned int sizes[], struct device *alloc_devs[])
-{
-       struct mtk_mdp_ctx *ctx = vb2_get_drv_priv(vq);
-       struct mtk_mdp_frame *frame;
-       int i;
-
-       frame = mtk_mdp_ctx_get_frame(ctx, vq->type);
-       *num_planes = frame->fmt->num_planes;
-       for (i = 0; i < frame->fmt->num_planes; i++)
-               sizes[i] = frame->payload[i];
-       mtk_mdp_dbg(2, "[%d] type:%d, planes:%d, buffers:%d, size:%u,%u",
-                   ctx->id, vq->type, *num_planes, *num_buffers,
-                   sizes[0], sizes[1]);
-       return 0;
-}
-
-static int mtk_mdp_m2m_buf_prepare(struct vb2_buffer *vb)
-{
-       struct mtk_mdp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-       struct mtk_mdp_frame *frame;
-       int i;
-
-       frame = mtk_mdp_ctx_get_frame(ctx, vb->vb2_queue->type);
-
-       if (!V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
-               for (i = 0; i < frame->fmt->num_planes; i++)
-                       vb2_set_plane_payload(vb, i, frame->payload[i]);
-       }
-
-       return 0;
-}
-
-static void mtk_mdp_m2m_buf_queue(struct vb2_buffer *vb)
-{
-       struct mtk_mdp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-
-       v4l2_m2m_buf_queue(ctx->m2m_ctx, to_vb2_v4l2_buffer(vb));
-}
-
-static const struct vb2_ops mtk_mdp_m2m_qops = {
-       .queue_setup     = mtk_mdp_m2m_queue_setup,
-       .buf_prepare     = mtk_mdp_m2m_buf_prepare,
-       .buf_queue       = mtk_mdp_m2m_buf_queue,
-       .stop_streaming  = mtk_mdp_m2m_stop_streaming,
-       .start_streaming = mtk_mdp_m2m_start_streaming,
-       .wait_prepare    = vb2_ops_wait_prepare,
-       .wait_finish     = vb2_ops_wait_finish,
-};
-
-static int mtk_mdp_m2m_querycap(struct file *file, void *fh,
-                               struct v4l2_capability *cap)
-{
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
-
-       strscpy(cap->driver, MTK_MDP_MODULE_NAME, sizeof(cap->driver));
-       strscpy(cap->card, mdp->pdev->name, sizeof(cap->card));
-       strscpy(cap->bus_info, "platform:mt8173", sizeof(cap->bus_info));
-
-       return 0;
-}
-
-static int mtk_mdp_enum_fmt(struct v4l2_fmtdesc *f, u32 type)
-{
-       const struct mtk_mdp_fmt *fmt;
-
-       fmt = mtk_mdp_find_fmt_by_index(f->index, type);
-       if (!fmt)
-               return -EINVAL;
-
-       f->pixelformat = fmt->pixelformat;
-
-       return 0;
-}
-
-static int mtk_mdp_m2m_enum_fmt_vid_cap(struct file *file, void *priv,
-                                       struct v4l2_fmtdesc *f)
-{
-       return mtk_mdp_enum_fmt(f, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-}
-
-static int mtk_mdp_m2m_enum_fmt_vid_out(struct file *file, void *priv,
-                                       struct v4l2_fmtdesc *f)
-{
-       return mtk_mdp_enum_fmt(f, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
-}
-
-static int mtk_mdp_m2m_g_fmt_mplane(struct file *file, void *fh,
-                                   struct v4l2_format *f)
-{
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-       struct mtk_mdp_frame *frame;
-       struct v4l2_pix_format_mplane *pix_mp;
-       int i;
-
-       mtk_mdp_dbg(2, "[%d] type:%d", ctx->id, f->type);
-
-       frame = mtk_mdp_ctx_get_frame(ctx, f->type);
-       pix_mp = &f->fmt.pix_mp;
-
-       pix_mp->width = frame->width;
-       pix_mp->height = frame->height;
-       pix_mp->field = V4L2_FIELD_NONE;
-       pix_mp->pixelformat = frame->fmt->pixelformat;
-       pix_mp->num_planes = frame->fmt->num_planes;
-       pix_mp->colorspace = ctx->colorspace;
-       pix_mp->xfer_func = ctx->xfer_func;
-       pix_mp->ycbcr_enc = ctx->ycbcr_enc;
-       pix_mp->quantization = ctx->quant;
-       mtk_mdp_dbg(2, "[%d] wxh:%dx%d", ctx->id,
-                   pix_mp->width, pix_mp->height);
-
-       for (i = 0; i < pix_mp->num_planes; ++i) {
-               pix_mp->plane_fmt[i].bytesperline = (frame->width *
-                       frame->fmt->row_depth[i]) / 8;
-               pix_mp->plane_fmt[i].sizeimage = (frame->width *
-                       frame->height * frame->fmt->depth[i]) / 8;
-
-               mtk_mdp_dbg(2, "[%d] p%d, bpl:%d, sizeimage:%d", ctx->id, i,
-                           pix_mp->plane_fmt[i].bytesperline,
-                           pix_mp->plane_fmt[i].sizeimage);
-       }
-
-       return 0;
-}
-
-static int mtk_mdp_m2m_try_fmt_mplane(struct file *file, void *fh,
-                                     struct v4l2_format *f)
-{
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-
-       if (!mtk_mdp_try_fmt_mplane(ctx, f))
-               return -EINVAL;
-       return 0;
-}
-
-static int mtk_mdp_m2m_s_fmt_mplane(struct file *file, void *fh,
-                                   struct v4l2_format *f)
-{
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-       struct vb2_queue *vq;
-       struct mtk_mdp_frame *frame;
-       struct v4l2_pix_format_mplane *pix_mp;
-       const struct mtk_mdp_fmt *fmt;
-       int i;
-
-       mtk_mdp_dbg(2, "[%d] type:%d", ctx->id, f->type);
-
-       frame = mtk_mdp_ctx_get_frame(ctx, f->type);
-       fmt = mtk_mdp_try_fmt_mplane(ctx, f);
-       if (!fmt) {
-               mtk_mdp_err("[%d] try_fmt failed, type:%d", ctx->id, f->type);
-               return -EINVAL;
-       }
-       frame->fmt = fmt;
-
-       vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);
-       if (vb2_is_streaming(vq)) {
-               dev_info(&ctx->mdp_dev->pdev->dev, "queue %d busy", f->type);
-               return -EBUSY;
-       }
-
-       pix_mp = &f->fmt.pix_mp;
-       for (i = 0; i < frame->fmt->num_planes; i++) {
-               frame->payload[i] = pix_mp->plane_fmt[i].sizeimage;
-               frame->pitch[i] = pix_mp->plane_fmt[i].bytesperline;
-       }
-
-       mtk_mdp_set_frame_size(frame, pix_mp->width, pix_mp->height);
-       if (V4L2_TYPE_IS_OUTPUT(f->type)) {
-               ctx->colorspace = pix_mp->colorspace;
-               ctx->xfer_func = pix_mp->xfer_func;
-               ctx->ycbcr_enc = pix_mp->ycbcr_enc;
-               ctx->quant = pix_mp->quantization;
-       }
-
-       mtk_mdp_dbg(2, "[%d] type:%d, frame:%dx%d", ctx->id, f->type,
-                   frame->width, frame->height);
-
-       return 0;
-}
-
-static int mtk_mdp_m2m_reqbufs(struct file *file, void *fh,
-                              struct v4l2_requestbuffers *reqbufs)
-{
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-
-       return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);
-}
-
-static int mtk_mdp_m2m_streamon(struct file *file, void *fh,
-                               enum v4l2_buf_type type)
-{
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-       int ret;
-
-       if (!mtk_mdp_ctx_state_is_set(ctx, MTK_MDP_VPU_INIT)) {
-               ret = mtk_mdp_vpu_init(&ctx->vpu);
-               if (ret < 0) {
-                       dev_err(&ctx->mdp_dev->pdev->dev,
-                               "vpu init failed %d\n",
-                               ret);
-                       return -EINVAL;
-               }
-               mtk_mdp_ctx_state_lock_set(ctx, MTK_MDP_VPU_INIT);
-       }
-
-       return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);
-}
-
-static inline bool mtk_mdp_is_target_compose(u32 target)
-{
-       if (target == V4L2_SEL_TGT_COMPOSE_DEFAULT
-           || target == V4L2_SEL_TGT_COMPOSE_BOUNDS
-           || target == V4L2_SEL_TGT_COMPOSE)
-               return true;
-       return false;
-}
-
-static inline bool mtk_mdp_is_target_crop(u32 target)
-{
-       if (target == V4L2_SEL_TGT_CROP_DEFAULT
-           || target == V4L2_SEL_TGT_CROP_BOUNDS
-           || target == V4L2_SEL_TGT_CROP)
-               return true;
-       return false;
-}
-
-static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
-                                      struct v4l2_selection *s)
-{
-       struct mtk_mdp_frame *frame;
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-       bool valid = false;
-
-       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               if (mtk_mdp_is_target_compose(s->target))
-                       valid = true;
-       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
-               if (mtk_mdp_is_target_crop(s->target))
-                       valid = true;
-       }
-       if (!valid) {
-               mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
-                           s->target);
-               return -EINVAL;
-       }
-
-       frame = mtk_mdp_ctx_get_frame(ctx, s->type);
-
-       switch (s->target) {
-       case V4L2_SEL_TGT_COMPOSE_DEFAULT:
-       case V4L2_SEL_TGT_COMPOSE_BOUNDS:
-       case V4L2_SEL_TGT_CROP_BOUNDS:
-       case V4L2_SEL_TGT_CROP_DEFAULT:
-               s->r.left = 0;
-               s->r.top = 0;
-               s->r.width = frame->width;
-               s->r.height = frame->height;
-               return 0;
-
-       case V4L2_SEL_TGT_COMPOSE:
-       case V4L2_SEL_TGT_CROP:
-               s->r.left = frame->crop.left;
-               s->r.top = frame->crop.top;
-               s->r.width = frame->crop.width;
-               s->r.height = frame->crop.height;
-               return 0;
-       }
-
-       return -EINVAL;
-}
-
-static int mtk_mdp_check_scaler_ratio(struct mtk_mdp_variant *var, int src_w,
-                                     int src_h, int dst_w, int dst_h, int rot)
-{
-       int tmp_w, tmp_h;
-
-       if (rot == 90 || rot == 270) {
-               tmp_w = dst_h;
-               tmp_h = dst_w;
-       } else {
-               tmp_w = dst_w;
-               tmp_h = dst_h;
-       }
-
-       if ((src_w / tmp_w) > var->h_scale_down_max ||
-           (src_h / tmp_h) > var->v_scale_down_max ||
-           (tmp_w / src_w) > var->h_scale_up_max ||
-           (tmp_h / src_h) > var->v_scale_up_max)
-               return -EINVAL;
-
-       return 0;
-}
-
-static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
-                                  struct v4l2_selection *s)
-{
-       struct mtk_mdp_frame *frame;
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
-       struct v4l2_rect new_r;
-       struct mtk_mdp_variant *variant = ctx->mdp_dev->variant;
-       int ret;
-       bool valid = false;
-
-       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               if (s->target == V4L2_SEL_TGT_COMPOSE)
-                       valid = true;
-       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
-               if (s->target == V4L2_SEL_TGT_CROP)
-                       valid = true;
-       }
-       if (!valid) {
-               mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
-                           s->target);
-               return -EINVAL;
-       }
-
-       new_r = s->r;
-       ret = mtk_mdp_try_crop(ctx, s->type, &new_r);
-       if (ret)
-               return ret;
-
-       if (mtk_mdp_is_target_crop(s->target))
-               frame = &ctx->s_frame;
-       else
-               frame = &ctx->d_frame;
-
-       /* Check to see if scaling ratio is within supported range */
-       if (V4L2_TYPE_IS_OUTPUT(s->type))
-               ret = mtk_mdp_check_scaler_ratio(variant, new_r.width,
-                       new_r.height, ctx->d_frame.crop.width,
-                       ctx->d_frame.crop.height,
-                       ctx->ctrls.rotate->val);
-       else
-               ret = mtk_mdp_check_scaler_ratio(variant,
-                       ctx->s_frame.crop.width,
-                       ctx->s_frame.crop.height, new_r.width,
-                       new_r.height, ctx->ctrls.rotate->val);
-
-       if (ret) {
-               dev_info(&ctx->mdp_dev->pdev->dev,
-                       "Out of scaler range");
-               return -EINVAL;
-       }
-
-       s->r = new_r;
-       frame->crop = new_r;
-
-       return 0;
-}
-
-static const struct v4l2_ioctl_ops mtk_mdp_m2m_ioctl_ops = {
-       .vidioc_querycap                = mtk_mdp_m2m_querycap,
-       .vidioc_enum_fmt_vid_cap        = mtk_mdp_m2m_enum_fmt_vid_cap,
-       .vidioc_enum_fmt_vid_out        = mtk_mdp_m2m_enum_fmt_vid_out,
-       .vidioc_g_fmt_vid_cap_mplane    = mtk_mdp_m2m_g_fmt_mplane,
-       .vidioc_g_fmt_vid_out_mplane    = mtk_mdp_m2m_g_fmt_mplane,
-       .vidioc_try_fmt_vid_cap_mplane  = mtk_mdp_m2m_try_fmt_mplane,
-       .vidioc_try_fmt_vid_out_mplane  = mtk_mdp_m2m_try_fmt_mplane,
-       .vidioc_s_fmt_vid_cap_mplane    = mtk_mdp_m2m_s_fmt_mplane,
-       .vidioc_s_fmt_vid_out_mplane    = mtk_mdp_m2m_s_fmt_mplane,
-       .vidioc_reqbufs                 = mtk_mdp_m2m_reqbufs,
-       .vidioc_create_bufs             = v4l2_m2m_ioctl_create_bufs,
-       .vidioc_expbuf                  = v4l2_m2m_ioctl_expbuf,
-       .vidioc_subscribe_event         = v4l2_ctrl_subscribe_event,
-       .vidioc_unsubscribe_event       = v4l2_event_unsubscribe,
-       .vidioc_querybuf                = v4l2_m2m_ioctl_querybuf,
-       .vidioc_qbuf                    = v4l2_m2m_ioctl_qbuf,
-       .vidioc_dqbuf                   = v4l2_m2m_ioctl_dqbuf,
-       .vidioc_streamon                = mtk_mdp_m2m_streamon,
-       .vidioc_streamoff               = v4l2_m2m_ioctl_streamoff,
-       .vidioc_g_selection             = mtk_mdp_m2m_g_selection,
-       .vidioc_s_selection             = mtk_mdp_m2m_s_selection
-};
-
-static int mtk_mdp_m2m_queue_init(void *priv, struct vb2_queue *src_vq,
-                                 struct vb2_queue *dst_vq)
-{
-       struct mtk_mdp_ctx *ctx = priv;
-       int ret;
-
-       memset(src_vq, 0, sizeof(*src_vq));
-       src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-       src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-       src_vq->drv_priv = ctx;
-       src_vq->ops = &mtk_mdp_m2m_qops;
-       src_vq->mem_ops = &vb2_dma_contig_memops;
-       src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-       src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-       src_vq->dev = &ctx->mdp_dev->pdev->dev;
-       src_vq->lock = &ctx->mdp_dev->lock;
-
-       ret = vb2_queue_init(src_vq);
-       if (ret)
-               return ret;
-
-       memset(dst_vq, 0, sizeof(*dst_vq));
-       dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-       dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-       dst_vq->drv_priv = ctx;
-       dst_vq->ops = &mtk_mdp_m2m_qops;
-       dst_vq->mem_ops = &vb2_dma_contig_memops;
-       dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-       dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-       dst_vq->dev = &ctx->mdp_dev->pdev->dev;
-       dst_vq->lock = &ctx->mdp_dev->lock;
-
-       return vb2_queue_init(dst_vq);
-}
-
-static int mtk_mdp_s_ctrl(struct v4l2_ctrl *ctrl)
-{
-       struct mtk_mdp_ctx *ctx = ctrl_to_ctx(ctrl);
-       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
-       struct mtk_mdp_variant *variant = mdp->variant;
-       int ret = 0;
-
-       if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE)
-               return 0;
-
-       switch (ctrl->id) {
-       case V4L2_CID_HFLIP:
-               ctx->hflip = ctrl->val;
-               break;
-       case V4L2_CID_VFLIP:
-               ctx->vflip = ctrl->val;
-               break;
-       case V4L2_CID_ROTATE:
-               ret = mtk_mdp_check_scaler_ratio(variant,
-                               ctx->s_frame.crop.width,
-                               ctx->s_frame.crop.height,
-                               ctx->d_frame.crop.width,
-                               ctx->d_frame.crop.height,
-                               ctx->ctrls.rotate->val);
-
-               if (ret)
-                       return -EINVAL;
-
-               ctx->rotation = ctrl->val;
-               break;
-       case V4L2_CID_ALPHA_COMPONENT:
-               ctx->d_frame.alpha = ctrl->val;
-               break;
-       }
-
-       return 0;
-}
-
-static const struct v4l2_ctrl_ops mtk_mdp_ctrl_ops = {
-       .s_ctrl = mtk_mdp_s_ctrl,
-};
-
-static int mtk_mdp_ctrls_create(struct mtk_mdp_ctx *ctx)
-{
-       v4l2_ctrl_handler_init(&ctx->ctrl_handler, MTK_MDP_MAX_CTRL_NUM);
-
-       ctx->ctrls.rotate = v4l2_ctrl_new_std(&ctx->ctrl_handler,
-                       &mtk_mdp_ctrl_ops, V4L2_CID_ROTATE, 0, 270, 90, 0);
-       ctx->ctrls.hflip = v4l2_ctrl_new_std(&ctx->ctrl_handler,
-                                            &mtk_mdp_ctrl_ops,
-                                            V4L2_CID_HFLIP,
-                                            0, 1, 1, 0);
-       ctx->ctrls.vflip = v4l2_ctrl_new_std(&ctx->ctrl_handler,
-                                            &mtk_mdp_ctrl_ops,
-                                            V4L2_CID_VFLIP,
-                                            0, 1, 1, 0);
-       ctx->ctrls.global_alpha = v4l2_ctrl_new_std(&ctx->ctrl_handler,
-                                                   &mtk_mdp_ctrl_ops,
-                                                   V4L2_CID_ALPHA_COMPONENT,
-                                                   0, 255, 1, 0);
-       ctx->ctrls_rdy = ctx->ctrl_handler.error == 0;
-
-       if (ctx->ctrl_handler.error) {
-               int err = ctx->ctrl_handler.error;
-
-               v4l2_ctrl_handler_free(&ctx->ctrl_handler);
-               dev_err(&ctx->mdp_dev->pdev->dev,
-                       "Failed to create control handlers\n");
-               return err;
-       }
-
-       return 0;
-}
-
-static void mtk_mdp_set_default_params(struct mtk_mdp_ctx *ctx)
-{
-       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
-       struct mtk_mdp_frame *frame;
-
-       frame = mtk_mdp_ctx_get_frame(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
-       frame->fmt = mtk_mdp_find_fmt_by_index(0,
-                                       V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
-       frame->width = mdp->variant->pix_min->org_w;
-       frame->height = mdp->variant->pix_min->org_h;
-       frame->payload[0] = frame->width * frame->height;
-       frame->payload[1] = frame->payload[0] / 2;
-
-       frame = mtk_mdp_ctx_get_frame(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-       frame->fmt = mtk_mdp_find_fmt_by_index(0,
-                                       V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-       frame->width = mdp->variant->pix_min->target_rot_dis_w;
-       frame->height = mdp->variant->pix_min->target_rot_dis_h;
-       frame->payload[0] = frame->width * frame->height;
-       frame->payload[1] = frame->payload[0] / 2;
-
-}
-
-static int mtk_mdp_m2m_open(struct file *file)
-{
-       struct mtk_mdp_dev *mdp = video_drvdata(file);
-       struct video_device *vfd = video_devdata(file);
-       struct mtk_mdp_ctx *ctx = NULL;
-       int ret;
-       struct v4l2_format default_format;
-
-       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
-       if (!ctx)
-               return -ENOMEM;
-
-       if (mutex_lock_interruptible(&mdp->lock)) {
-               ret = -ERESTARTSYS;
-               goto err_lock;
-       }
-
-       mutex_init(&ctx->slock);
-       ctx->id = mdp->id_counter++;
-       v4l2_fh_init(&ctx->fh, vfd);
-       file->private_data = &ctx->fh;
-       ret = mtk_mdp_ctrls_create(ctx);
-       if (ret)
-               goto error_ctrls;
-
-       /* Use separate control handler per file handle */
-       ctx->fh.ctrl_handler = &ctx->ctrl_handler;
-       v4l2_fh_add(&ctx->fh);
-       INIT_LIST_HEAD(&ctx->list);
-
-       ctx->mdp_dev = mdp;
-       mtk_mdp_set_default_params(ctx);
-
-       INIT_WORK(&ctx->work, mtk_mdp_m2m_worker);
-       ctx->m2m_ctx = v4l2_m2m_ctx_init(mdp->m2m_dev, ctx,
-                                        mtk_mdp_m2m_queue_init);
-       if (IS_ERR(ctx->m2m_ctx)) {
-               dev_err(&mdp->pdev->dev, "Failed to initialize m2m context");
-               ret = PTR_ERR(ctx->m2m_ctx);
-               goto error_m2m_ctx;
-       }
-       ctx->fh.m2m_ctx = ctx->m2m_ctx;
-       if (mdp->ctx_num++ == 0) {
-               ret = vpu_load_firmware(mdp->vpu_dev);
-               if (ret < 0) {
-                       dev_err(&mdp->pdev->dev,
-                               "vpu_load_firmware failed %d\n", ret);
-                       goto err_load_vpu;
-               }
-
-               ret = mtk_mdp_vpu_register(mdp->pdev);
-               if (ret < 0) {
-                       dev_err(&mdp->pdev->dev,
-                               "mdp_vpu register failed %d\n", ret);
-                       goto err_load_vpu;
-               }
-       }
-
-       list_add(&ctx->list, &mdp->ctx_list);
-       mutex_unlock(&mdp->lock);
-
-       /* Default format */
-       memset(&default_format, 0, sizeof(default_format));
-       default_format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-       default_format.fmt.pix_mp.width = 32;
-       default_format.fmt.pix_mp.height = 32;
-       default_format.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_YUV420M;
-       mtk_mdp_m2m_s_fmt_mplane(file, &ctx->fh, &default_format);
-       default_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-       mtk_mdp_m2m_s_fmt_mplane(file, &ctx->fh, &default_format);
-
-       mtk_mdp_dbg(0, "%s [%d]", dev_name(&mdp->pdev->dev), ctx->id);
-
-       return 0;
-
-err_load_vpu:
-       mdp->ctx_num--;
-       v4l2_m2m_ctx_release(ctx->m2m_ctx);
-error_m2m_ctx:
-       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
-error_ctrls:
-       v4l2_fh_del(&ctx->fh);
-       v4l2_fh_exit(&ctx->fh);
-       mutex_unlock(&mdp->lock);
-err_lock:
-       kfree(ctx);
-
-       return ret;
-}
-
-static int mtk_mdp_m2m_release(struct file *file)
-{
-       struct mtk_mdp_ctx *ctx = fh_to_ctx(file->private_data);
-       struct mtk_mdp_dev *mdp = ctx->mdp_dev;
-
-       flush_workqueue(mdp->job_wq);
-       mutex_lock(&mdp->lock);
-       v4l2_m2m_ctx_release(ctx->m2m_ctx);
-       v4l2_ctrl_handler_free(&ctx->ctrl_handler);
-       v4l2_fh_del(&ctx->fh);
-       v4l2_fh_exit(&ctx->fh);
-       mtk_mdp_vpu_deinit(&ctx->vpu);
-       mdp->ctx_num--;
-       list_del_init(&ctx->list);
-
-       mtk_mdp_dbg(0, "%s [%d]", dev_name(&mdp->pdev->dev), ctx->id);
-
-       mutex_unlock(&mdp->lock);
-       kfree(ctx);
-
-       return 0;
-}
-
-static const struct v4l2_file_operations mtk_mdp_m2m_fops = {
-       .owner          = THIS_MODULE,
-       .open           = mtk_mdp_m2m_open,
-       .release        = mtk_mdp_m2m_release,
-       .poll           = v4l2_m2m_fop_poll,
-       .unlocked_ioctl = video_ioctl2,
-       .mmap           = v4l2_m2m_fop_mmap,
-};
-
-static const struct v4l2_m2m_ops mtk_mdp_m2m_ops = {
-       .device_run     = mtk_mdp_m2m_device_run,
-};
-
-int mtk_mdp_register_m2m_device(struct mtk_mdp_dev *mdp)
-{
-       struct device *dev = &mdp->pdev->dev;
-       int ret;
-
-       mdp->variant = &mtk_mdp_default_variant;
-       mdp->vdev = video_device_alloc();
-       if (!mdp->vdev) {
-               dev_err(dev, "failed to allocate video device\n");
-               ret = -ENOMEM;
-               goto err_video_alloc;
-       }
-       mdp->vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
-       mdp->vdev->fops = &mtk_mdp_m2m_fops;
-       mdp->vdev->ioctl_ops = &mtk_mdp_m2m_ioctl_ops;
-       mdp->vdev->release = video_device_release;
-       mdp->vdev->lock = &mdp->lock;
-       mdp->vdev->vfl_dir = VFL_DIR_M2M;
-       mdp->vdev->v4l2_dev = &mdp->v4l2_dev;
-       snprintf(mdp->vdev->name, sizeof(mdp->vdev->name), "%s:m2m",
-                MTK_MDP_MODULE_NAME);
-       video_set_drvdata(mdp->vdev, mdp);
-
-       mdp->m2m_dev = v4l2_m2m_init(&mtk_mdp_m2m_ops);
-       if (IS_ERR(mdp->m2m_dev)) {
-               dev_err(dev, "failed to initialize v4l2-m2m device\n");
-               ret = PTR_ERR(mdp->m2m_dev);
-               goto err_m2m_init;
-       }
-
-       ret = video_register_device(mdp->vdev, VFL_TYPE_VIDEO, 2);
-       if (ret) {
-               dev_err(dev, "failed to register video device\n");
-               goto err_vdev_register;
-       }
-
-       v4l2_info(&mdp->v4l2_dev, "driver registered as /dev/video%d",
-                 mdp->vdev->num);
-       return 0;
-
-err_vdev_register:
-       v4l2_m2m_release(mdp->m2m_dev);
-err_m2m_init:
-       video_device_release(mdp->vdev);
-err_video_alloc:
-
-       return ret;
-}
-
-void mtk_mdp_unregister_m2m_device(struct mtk_mdp_dev *mdp)
-{
-       video_unregister_device(mdp->vdev);
-       v4l2_m2m_release(mdp->m2m_dev);
-}
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h
deleted file mode 100644 (file)
index 485dbdb..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2016 MediaTek Inc.
- * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#ifndef __MTK_MDP_M2M_H__
-#define __MTK_MDP_M2M_H__
-
-void mtk_mdp_ctx_state_lock_set(struct mtk_mdp_ctx *ctx, u32 state);
-int mtk_mdp_register_m2m_device(struct mtk_mdp_dev *mdp);
-void mtk_mdp_unregister_m2m_device(struct mtk_mdp_dev *mdp);
-
-#endif /* __MTK_MDP_M2M_H__ */
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c
deleted file mode 100644 (file)
index ba476d5..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015-2016 MediaTek Inc.
- * Author: Houlong Wei <houlong.wei@mediatek.com>
- *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#include <linux/platform_device.h>
-
-#include "mtk_mdp_core.h"
-#include "mtk_mdp_regs.h"
-
-
-#define MDP_COLORFMT_PACK(VIDEO, PLANE, COPLANE, HF, VF, BITS, GROUP, SWAP, ID)\
-       (((VIDEO) << 27) | ((PLANE) << 24) | ((COPLANE) << 22) |\
-       ((HF) << 20) | ((VF) << 18) | ((BITS) << 8) | ((GROUP) << 6) |\
-       ((SWAP) << 5) | ((ID) << 0))
-
-enum MDP_COLOR_ENUM {
-       MDP_COLOR_UNKNOWN = 0,
-       MDP_COLOR_NV12 = MDP_COLORFMT_PACK(0, 2, 1, 1, 1, 8, 1, 0, 12),
-       MDP_COLOR_I420 = MDP_COLORFMT_PACK(0, 3, 0, 1, 1, 8, 1, 0, 8),
-       MDP_COLOR_YV12 = MDP_COLORFMT_PACK(0, 3, 0, 1, 1, 8, 1, 1, 8),
-       /* Mediatek proprietary format */
-       MDP_COLOR_420_MT21 = MDP_COLORFMT_PACK(5, 2, 1, 1, 1, 256, 1, 0, 12),
-};
-
-static int32_t mtk_mdp_map_color_format(int v4l2_format)
-{
-       switch (v4l2_format) {
-       case V4L2_PIX_FMT_NV12M:
-       case V4L2_PIX_FMT_NV12:
-               return MDP_COLOR_NV12;
-       case V4L2_PIX_FMT_MT21C:
-               return MDP_COLOR_420_MT21;
-       case V4L2_PIX_FMT_YUV420M:
-       case V4L2_PIX_FMT_YUV420:
-               return MDP_COLOR_I420;
-       case V4L2_PIX_FMT_YVU420:
-               return MDP_COLOR_YV12;
-       }
-
-       mtk_mdp_err("Unknown format 0x%x", v4l2_format);
-
-       return MDP_COLOR_UNKNOWN;
-}
-
-void mtk_mdp_hw_set_input_addr(struct mtk_mdp_ctx *ctx,
-                              struct mtk_mdp_addr *addr)
-{
-       struct mdp_buffer *src_buf = &ctx->vpu.vsi->src_buffer;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(addr->addr); i++)
-               src_buf->addr_mva[i] = (uint64_t)addr->addr[i];
-}
-
-void mtk_mdp_hw_set_output_addr(struct mtk_mdp_ctx *ctx,
-                               struct mtk_mdp_addr *addr)
-{
-       struct mdp_buffer *dst_buf = &ctx->vpu.vsi->dst_buffer;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(addr->addr); i++)
-               dst_buf->addr_mva[i] = (uint64_t)addr->addr[i];
-}
-
-void mtk_mdp_hw_set_in_size(struct mtk_mdp_ctx *ctx)
-{
-       struct mtk_mdp_frame *frame = &ctx->s_frame;
-       struct mdp_config *config = &ctx->vpu.vsi->src_config;
-
-       /* Set input pixel offset */
-       config->crop_x = frame->crop.left;
-       config->crop_y = frame->crop.top;
-
-       /* Set input cropped size */
-       config->crop_w = frame->crop.width;
-       config->crop_h = frame->crop.height;
-
-       /* Set input original size */
-       config->x = 0;
-       config->y = 0;
-       config->w = frame->width;
-       config->h = frame->height;
-}
-
-void mtk_mdp_hw_set_in_image_format(struct mtk_mdp_ctx *ctx)
-{
-       unsigned int i;
-       struct mtk_mdp_frame *frame = &ctx->s_frame;
-       struct mdp_config *config = &ctx->vpu.vsi->src_config;
-       struct mdp_buffer *src_buf = &ctx->vpu.vsi->src_buffer;
-
-       src_buf->plane_num = frame->fmt->num_comp;
-       config->format = mtk_mdp_map_color_format(frame->fmt->pixelformat);
-       config->w_stride = 0; /* MDP will calculate it by color format. */
-       config->h_stride = 0; /* MDP will calculate it by color format. */
-
-       for (i = 0; i < src_buf->plane_num; i++)
-               src_buf->plane_size[i] = frame->payload[i];
-}
-
-void mtk_mdp_hw_set_out_size(struct mtk_mdp_ctx *ctx)
-{
-       struct mtk_mdp_frame *frame = &ctx->d_frame;
-       struct mdp_config *config = &ctx->vpu.vsi->dst_config;
-
-       config->crop_x = frame->crop.left;
-       config->crop_y = frame->crop.top;
-       config->crop_w = frame->crop.width;
-       config->crop_h = frame->crop.height;
-       config->x = 0;
-       config->y = 0;
-       config->w = frame->width;
-       config->h = frame->height;
-}
-
-void mtk_mdp_hw_set_out_image_format(struct mtk_mdp_ctx *ctx)
-{
-       unsigned int i;
-       struct mtk_mdp_frame *frame = &ctx->d_frame;
-       struct mdp_config *config = &ctx->vpu.vsi->dst_config;
-       struct mdp_buffer *dst_buf = &ctx->vpu.vsi->dst_buffer;
-
-       dst_buf->plane_num = frame->fmt->num_comp;
-       config->format = mtk_mdp_map_color_format(frame->fmt->pixelformat);
-       config->w_stride = 0; /* MDP will calculate it by color format. */
-       config->h_stride = 0; /* MDP will calculate it by color format. */
-       for (i = 0; i < dst_buf->plane_num; i++)
-               dst_buf->plane_size[i] = frame->payload[i];
-}
-
-void mtk_mdp_hw_set_rotation(struct mtk_mdp_ctx *ctx)
-{
-       struct mdp_config_misc *misc = &ctx->vpu.vsi->misc;
-
-       misc->orientation = ctx->ctrls.rotate->val;
-       misc->hflip = ctx->ctrls.hflip->val;
-       misc->vflip = ctx->ctrls.vflip->val;
-}
-
-void mtk_mdp_hw_set_global_alpha(struct mtk_mdp_ctx *ctx)
-{
-       struct mdp_config_misc *misc = &ctx->vpu.vsi->misc;
-
-       misc->alpha = ctx->ctrls.global_alpha->val;
-}
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h
deleted file mode 100644 (file)
index 32cf202..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2016 MediaTek Inc.
- * Author: Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#ifndef __MTK_MDP_REGS_H__
-#define __MTK_MDP_REGS_H__
-
-
-void mtk_mdp_hw_set_input_addr(struct mtk_mdp_ctx *ctx,
-                              struct mtk_mdp_addr *addr);
-void mtk_mdp_hw_set_output_addr(struct mtk_mdp_ctx *ctx,
-                               struct mtk_mdp_addr *addr);
-void mtk_mdp_hw_set_in_size(struct mtk_mdp_ctx *ctx);
-void mtk_mdp_hw_set_in_image_format(struct mtk_mdp_ctx *ctx);
-void mtk_mdp_hw_set_out_size(struct mtk_mdp_ctx *ctx);
-void mtk_mdp_hw_set_out_image_format(struct mtk_mdp_ctx *ctx);
-void mtk_mdp_hw_set_rotation(struct mtk_mdp_ctx *ctx);
-void mtk_mdp_hw_set_global_alpha(struct mtk_mdp_ctx *ctx);
-
-
-#endif /* __MTK_MDP_REGS_H__ */
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
deleted file mode 100644 (file)
index b065ccd..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2015-2016 MediaTek Inc.
- * Author: Houlong Wei <houlong.wei@mediatek.com>
- *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#include "mtk_mdp_core.h"
-#include "mtk_mdp_vpu.h"
-#include "mtk_vpu.h"
-
-
-static inline struct mtk_mdp_ctx *vpu_to_ctx(struct mtk_mdp_vpu *vpu)
-{
-       return container_of(vpu, struct mtk_mdp_ctx, vpu);
-}
-
-static void mtk_mdp_vpu_handle_init_ack(const struct mdp_ipi_comm_ack *msg)
-{
-       struct mtk_mdp_vpu *vpu = (struct mtk_mdp_vpu *)
-                                       (unsigned long)msg->ap_inst;
-
-       /* mapping VPU address to kernel virtual address */
-       vpu->vsi = (struct mdp_process_vsi *)
-                       vpu_mapping_dm_addr(vpu->pdev, msg->vpu_inst_addr);
-       vpu->inst_addr = msg->vpu_inst_addr;
-}
-
-static void mtk_mdp_vpu_ipi_handler(const void *data, unsigned int len,
-                                   void *priv)
-{
-       const struct mdp_ipi_comm_ack *msg = data;
-       unsigned int msg_id = msg->msg_id;
-       struct mtk_mdp_vpu *vpu = (struct mtk_mdp_vpu *)
-                                       (unsigned long)msg->ap_inst;
-       struct mtk_mdp_ctx *ctx;
-
-       vpu->failure = msg->status;
-       if (!vpu->failure) {
-               switch (msg_id) {
-               case VPU_MDP_INIT_ACK:
-                       mtk_mdp_vpu_handle_init_ack(data);
-                       break;
-               case VPU_MDP_DEINIT_ACK:
-               case VPU_MDP_PROCESS_ACK:
-                       break;
-               default:
-                       ctx = vpu_to_ctx(vpu);
-                       dev_err(&ctx->mdp_dev->pdev->dev,
-                               "handle unknown ipi msg:0x%x\n",
-                               msg_id);
-                       break;
-               }
-       } else {
-               ctx = vpu_to_ctx(vpu);
-               mtk_mdp_dbg(0, "[%d]:msg 0x%x, failure:%d", ctx->id,
-                           msg_id, vpu->failure);
-       }
-}
-
-int mtk_mdp_vpu_register(struct platform_device *pdev)
-{
-       struct mtk_mdp_dev *mdp = platform_get_drvdata(pdev);
-       int err;
-
-       err = vpu_ipi_register(mdp->vpu_dev, IPI_MDP,
-                              mtk_mdp_vpu_ipi_handler, "mdp_vpu", NULL);
-       if (err)
-               dev_err(&mdp->pdev->dev,
-                       "vpu_ipi_registration fail status=%d\n", err);
-
-       return err;
-}
-
-static int mtk_mdp_vpu_send_msg(void *msg, int len, struct mtk_mdp_vpu *vpu,
-                               int id)
-{
-       struct mtk_mdp_ctx *ctx = vpu_to_ctx(vpu);
-       int err;
-
-       if (!vpu->pdev) {
-               mtk_mdp_dbg(1, "[%d]:vpu pdev is NULL", ctx->id);
-               return -EINVAL;
-       }
-
-       mutex_lock(&ctx->mdp_dev->vpulock);
-       err = vpu_ipi_send(vpu->pdev, (enum ipi_id)id, msg, len);
-       if (err)
-               dev_err(&ctx->mdp_dev->pdev->dev,
-                       "vpu_ipi_send fail status %d\n", err);
-       mutex_unlock(&ctx->mdp_dev->vpulock);
-
-       return err;
-}
-
-static int mtk_mdp_vpu_send_ap_ipi(struct mtk_mdp_vpu *vpu, uint32_t msg_id)
-{
-       int err;
-       struct mdp_ipi_comm msg;
-
-       msg.msg_id = msg_id;
-       msg.ipi_id = IPI_MDP;
-       msg.vpu_inst_addr = vpu->inst_addr;
-       msg.ap_inst = (unsigned long)vpu;
-       err = mtk_mdp_vpu_send_msg((void *)&msg, sizeof(msg), vpu, IPI_MDP);
-       if (!err && vpu->failure)
-               err = -EINVAL;
-
-       return err;
-}
-
-int mtk_mdp_vpu_init(struct mtk_mdp_vpu *vpu)
-{
-       int err;
-       struct mdp_ipi_init msg;
-       struct mtk_mdp_ctx *ctx = vpu_to_ctx(vpu);
-
-       vpu->pdev = ctx->mdp_dev->vpu_dev;
-
-       msg.msg_id = AP_MDP_INIT;
-       msg.ipi_id = IPI_MDP;
-       msg.ap_inst = (unsigned long)vpu;
-       err = mtk_mdp_vpu_send_msg((void *)&msg, sizeof(msg), vpu, IPI_MDP);
-       if (!err && vpu->failure)
-               err = -EINVAL;
-
-       return err;
-}
-
-int mtk_mdp_vpu_deinit(struct mtk_mdp_vpu *vpu)
-{
-       return mtk_mdp_vpu_send_ap_ipi(vpu, AP_MDP_DEINIT);
-}
-
-int mtk_mdp_vpu_process(struct mtk_mdp_vpu *vpu)
-{
-       return mtk_mdp_vpu_send_ap_ipi(vpu, AP_MDP_PROCESS);
-}
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h
deleted file mode 100644 (file)
index 5a10205..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (c) 2015-2016 MediaTek Inc.
- * Author: Houlong Wei <houlong.wei@mediatek.com>
- *         Ming Hsiu Tsai <minghsiu.tsai@mediatek.com>
- */
-
-#ifndef __MTK_MDP_VPU_H__
-#define __MTK_MDP_VPU_H__
-
-#include "mtk_mdp_ipi.h"
-
-
-/**
- * struct mtk_mdp_vpu - VPU instance for MDP
- * @pdev       : pointer to the VPU platform device
- * @inst_addr  : VPU MDP instance address
- * @failure    : VPU execution result status
- * @vsi                : VPU shared information
- */
-struct mtk_mdp_vpu {
-       struct platform_device  *pdev;
-       uint32_t                inst_addr;
-       int32_t                 failure;
-       struct mdp_process_vsi  *vsi;
-};
-
-int mtk_mdp_vpu_register(struct platform_device *pdev);
-int mtk_mdp_vpu_init(struct mtk_mdp_vpu *vpu);
-int mtk_mdp_vpu_deinit(struct mtk_mdp_vpu *vpu);
-int mtk_mdp_vpu_process(struct mtk_mdp_vpu *vpu);
-
-#endif /* __MTK_MDP_VPU_H__ */