@@ -7,6 +7,7 @@
*/
#include <linux/clk.h>
+#include <linux/component.h>
#include <linux/err.h>
#include <linux/interrupt.h>
#include <linux/io.h>
@@ -1493,12 +1494,99 @@ static inline void mtk_jpeg_clk_release(struct mtk_jpeg_dev *jpeg)
put_device(jpeg->larb);
}
+static const struct of_device_id mtk_jpegenc_drv_ids[] = {
+ {
+ .compatible = "mediatek,mt8195-jpgenc0",
+ .data = (void *)MTK_JPEGENC_HW0,
+ },
+ {
+ .compatible = "mediatek,mt8195-jpgenc1",
+ .data = (void *)MTK_JPEGENC_HW1,
+ },
+ {},
+};
+
+static inline int mtk_vdec_compare_of(struct device *dev, void *data)
+{
+ return dev->of_node == data;
+}
+
+static inline void mtk_vdec_release_of(struct device *dev, void *data)
+{
+ of_node_put(data);
+}
+
+static inline int mtk_jpegenc_bind(struct device *dev)
+{
+ struct mtk_jpeg_dev *data = dev_get_drvdata(dev);
+
+ return component_bind_all(dev, data);
+}
+
+static inline void mtk_jpegenc_unbind(struct device *dev)
+{
+ struct mtk_jpeg_dev *data = dev_get_drvdata(dev);
+
+ component_unbind_all(dev, data);
+}
+
+static const struct component_master_ops mtk_jpegenc_ops = {
+ .bind = mtk_jpegenc_bind,
+ .unbind = mtk_jpegenc_unbind,
+};
+
+static struct component_match *mtk_jpegenc_match_add(struct mtk_jpeg_dev *jpeg)
+{
+ struct device *dev = jpeg->dev;
+ struct component_match *match = NULL;
+ int i;
+ char compatible[128] = {0};
+
+ for (i = 0; i < ARRAY_SIZE(mtk_jpegenc_drv_ids); i++) {
+ struct device_node *comp_node;
+ enum mtk_jpegenc_hw_id comp_idx;
+ const struct of_device_id *of_id;
+
+ memcpy(compatible, mtk_jpegenc_drv_ids[i].compatible,
+ sizeof(mtk_jpegenc_drv_ids[i].compatible));
+
+ comp_node = of_find_compatible_node(NULL, NULL,
+ compatible);
+ if (!comp_node)
+ continue;
+
+ if (!of_device_is_available(comp_node)) {
+ of_node_put(comp_node);
+ v4l2_err(&jpeg->v4l2_dev, "Fail to get jpeg enc HW node\n");
+ continue;
+ }
+
+ of_id = of_match_node(mtk_jpegenc_drv_ids, comp_node);
+ if (!of_id) {
+ v4l2_err(&jpeg->v4l2_dev, "Failed to get match node\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ comp_idx = (enum mtk_jpegenc_hw_id)of_id->data;
+ v4l2_info(&jpeg->v4l2_dev, "Get component:hw_id(%d),jpeg_dev(0x%p),comp_node(0x%p)\n",
+ comp_idx, jpeg, comp_node);
+
+ jpeg->component_node[comp_idx] = comp_node;
+
+ component_match_add_release(dev, &match, mtk_vdec_release_of,
+ mtk_vdec_compare_of, comp_node);
+ }
+
+ return match;
+}
+
static int mtk_jpeg_probe(struct platform_device *pdev)
{
struct mtk_jpeg_dev *jpeg;
struct resource *res;
int jpeg_irq;
int ret;
+ struct component_match *match;
jpeg = devm_kzalloc(&pdev->dev, sizeof(*jpeg), GFP_KERNEL);
if (!jpeg)
@@ -1510,31 +1598,47 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
jpeg->variant = of_device_get_match_data(jpeg->dev);
INIT_DELAYED_WORK(&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- jpeg->reg_base[0] = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(jpeg->reg_base)) {
- ret = PTR_ERR(jpeg->reg_base);
- return ret;
- }
+ if (!jpeg->variant->is_encoder) {
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ jpeg->reg_base[MTK_JPEGENC_HW0] =
+ devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(jpeg->reg_base[MTK_JPEGENC_HW0])) {
+ ret = PTR_ERR(jpeg->reg_base[MTK_JPEGENC_HW0]);
+ return ret;
+ }
- jpeg_irq = platform_get_irq(pdev, 0);
- if (jpeg_irq < 0) {
- dev_err(&pdev->dev, "Failed to get jpeg_irq %d.\n", jpeg_irq);
- return jpeg_irq;
- }
+ jpeg_irq = platform_get_irq(pdev, 0);
+ if (jpeg_irq < 0) {
+ dev_err(&pdev->dev, "Failed to get jpeg_irq %d.\n",
+ jpeg_irq);
+ return jpeg_irq;
+ }
- ret = devm_request_irq(&pdev->dev, jpeg_irq,
- jpeg->variant->irq_handler, 0, pdev->name, jpeg);
- if (ret) {
- dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n",
- jpeg_irq, ret);
- goto err_req_irq;
- }
+ ret = devm_request_irq(&pdev->dev, jpeg_irq,
+ jpeg->variant->irq_handler,
+ 0, pdev->name, jpeg);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n",
+ jpeg_irq, ret);
+ goto err_req_irq;
+ }
- ret = mtk_jpeg_clk_init(jpeg);
- if (ret) {
- dev_err(&pdev->dev, "Failed to init clk, err %d\n", ret);
- goto err_clk_init;
+ ret = mtk_jpeg_clk_init(jpeg);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to init clk\n");
+ goto err_clk_init;
+ }
+ } else {
+ init_waitqueue_head(&jpeg->hw_wq);
+
+ jpeg->workqueue = alloc_ordered_workqueue(MTK_JPEG_NAME,
+ WQ_MEM_RECLAIM |
+ WQ_FREEZABLE);
+ if (!jpeg->workqueue) {
+ dev_err(&pdev->dev, "Failed to create jpeg workqueue!\n");
+ ret = -EINVAL;
+ goto err_alloc_workqueue;
+ }
}
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
@@ -1583,7 +1687,20 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, jpeg);
- pm_runtime_enable(&pdev->dev);
+ if (jpeg->variant->is_encoder) {
+ match = mtk_jpegenc_match_add(jpeg);
+ if (IS_ERR_OR_NULL(match))
+ goto err_vfd_jpeg_register;
+
+ video_set_drvdata(jpeg->vdev, jpeg);
+ platform_set_drvdata(pdev, jpeg);
+ ret = component_master_add_with_match(&pdev->dev,
+ &mtk_jpegenc_ops, match);
+ if (ret < 0)
+ goto err_vfd_jpeg_register;
+ } else {
+ pm_runtime_enable(&pdev->dev);
+ }
return 0;
@@ -1601,6 +1718,8 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
err_clk_init:
+err_alloc_workqueue:
+
err_req_irq:
return ret;
@@ -1721,7 +1840,25 @@ static struct platform_driver mtk_jpeg_driver = {
},
};
-module_platform_driver(mtk_jpeg_driver);
+static struct platform_driver * const mtk_jpeg_source_drivers[] = {
+ &mtk_jpegenc_hw_driver,
+ &mtk_jpeg_driver,
+};
+
+static int __init mtk_jpeg_init(void)
+{
+ return platform_register_drivers(mtk_jpeg_source_drivers,
+ ARRAY_SIZE(mtk_jpeg_source_drivers));
+}
+
+static void __exit mtk_jpeg_exit(void)
+{
+ platform_unregister_drivers(mtk_jpeg_source_drivers,
+ ARRAY_SIZE(mtk_jpeg_source_drivers));
+}
+
+module_init(mtk_jpeg_init);
+module_exit(mtk_jpeg_exit);
MODULE_DESCRIPTION("MediaTek JPEG codec driver");
MODULE_LICENSE("GPL v2");
@@ -125,6 +125,8 @@ struct mtk_jpegenc_pm {
* @larb: SMI device
* @job_timeout_work: IRQ timeout structure
* @variant: driver variant to be used
+ * @irqlock: spinlock protecting for irq
+ * @dev_mutex: the mutex protecting for device
*/
struct mtk_jpeg_dev {
struct mutex lock;
@@ -136,12 +138,18 @@ struct mtk_jpeg_dev {
void *alloc_ctx;
struct video_device *vdev;
struct device *larb;
- struct delayed_work job_timeout_work;
const struct mtk_jpeg_variant *variant;
+ struct clk *clk_jpeg;
+ struct delayed_work job_timeout_work;
+ struct platform_device *plat_dev;
+ spinlock_t irqlock; /* spinlock protecting for irq */
+ struct mutex dev_mutex; /* the mutex protecting for device */
void __iomem *reg_base[MTK_JPEGENC_HW_MAX];
int jpegenc_irq;
struct mtk_jpeg_dev *hw_dev[MTK_JPEGENC_HW_MAX];
+ struct device_node *component_node[MTK_JPEGENC_HW_MAX];
+ int comp_idx;
struct mtk_jpegenc_pm pm;
enum mtk_jpeg_hw_state hw_state;
struct mtk_jpeg_hw_param hw_param;
@@ -149,6 +157,8 @@ struct mtk_jpeg_dev {
atomic_t hw_rdy;
};
+extern struct platform_driver mtk_jpegenc_hw_driver;
+
/**
* struct mtk_jpeg_fmt - driver's internal color format data
* @fourcc: the fourcc code, 0 if not applicable
@@ -194,6 +204,7 @@ struct mtk_jpeg_q_data {
* @enc_quality: jpeg encoder quality
* @restart_interval: jpeg encoder restart interval
* @ctrl_hdl: controls handler
+ * @done_queue_lock: spinlock protecting for buffer done queue
*/
struct mtk_jpeg_ctx {
struct mtk_jpeg_dev *jpeg;
@@ -213,4 +224,7 @@ struct mtk_jpeg_ctx {
struct work_struct jpeg_work;
};
+void mtk_jpegenc_timeout_work(struct work_struct *work);
+irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv);
+
#endif /* _MTK_JPEG_CORE_H */
@@ -5,11 +5,21 @@
*
*/
+#include <linux/clk.h>
+#include <linux/component.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/io.h>
#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-contig.h>
+#include "mtk_jpeg_core.h"
#include "mtk_jpeg_enc_hw.h"
static const struct mtk_jpeg_enc_qlt mtk_jpeg_enc_quality[] = {
@@ -153,6 +163,182 @@ void mtk_jpeg_set_enc_params(struct mtk_jpeg_ctx *ctx, void __iomem *base)
writel(ctx->restart_interval, base + JPEG_ENC_RST_MCU_NUM);
}
+static int mtk_jpegenc_hw_bind(struct device *dev,
+ struct device *master, void *data)
+{
+ struct mtk_jpeg_dev *comp_priv = dev_get_drvdata(dev);
+ struct mtk_jpeg_dev *master_priv = data;
+ int i;
+
+ for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) {
+ if (dev->of_node != master_priv->component_node[i])
+ continue;
+ master_priv->hw_dev[i] = comp_priv;
+ comp_priv->comp_idx = i;
+ master_priv->reg_base[i] = comp_priv->reg_base[MTK_JPEGENC_HW0];
+ break;
+ }
+ if (i == MTK_JPEGENC_HW_MAX) {
+ dev_err(dev, "Failed to get component node\n");
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static void mtk_jpegenc_hw_unbind(struct device *dev,
+ struct device *master, void *data)
+{
+ struct mtk_jpeg_dev *comp_priv = dev_get_drvdata(dev);
+
+ comp_priv->reg_base[MTK_JPEGENC_HW0] = 0;
+}
+
+static const struct component_ops mtk_jpegenc_hw_component_ops = {
+ .bind = mtk_jpegenc_hw_bind,
+ .unbind = mtk_jpegenc_hw_unbind,
+};
+
+int mtk_jpegenc_init_pm(struct mtk_jpeg_dev *mtkdev)
+{
+ struct platform_device *pdev;
+ struct mtk_jpegenc_pm *pm;
+ struct mtk_jpegenc_clk *jpegenc_clk;
+ struct mtk_jpegenc_clk_info *clk_info;
+ int i, ret;
+
+ pdev = mtkdev->plat_dev;
+ pm->dev = &pdev->dev;
+ pm = &mtkdev->pm;
+ pm->mtkdev = mtkdev;
+ jpegenc_clk = &pm->venc_clk;
+ jpegenc_clk->clk_num =
+ of_property_count_strings(pdev->dev.of_node, "clock-names");
+ if (!jpegenc_clk->clk_num) {
+ dev_err(&pdev->dev, "Failed to get jpegenc clock count\n");
+ return -EINVAL;
+ }
+
+ jpegenc_clk->clk_info = devm_kcalloc(&pdev->dev,
+ jpegenc_clk->clk_num,
+ sizeof(*clk_info),
+ GFP_KERNEL);
+ if (!jpegenc_clk->clk_info)
+ return -ENOMEM;
+
+ for (i = 0; i < jpegenc_clk->clk_num; i++) {
+ clk_info = &jpegenc_clk->clk_info[i];
+ ret = of_property_read_string_index(pdev->dev.of_node,
+ "clock-names", i,
+ &clk_info->clk_name);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to get jpegenc clock name\n");
+ return ret;
+ }
+
+ clk_info->jpegenc_clk = devm_clk_get(&pdev->dev,
+ clk_info->clk_name);
+ if (IS_ERR(clk_info->jpegenc_clk)) {
+ dev_err(&pdev->dev, "devm_clk_get (%d)%s fail",
+ i, clk_info->clk_name);
+ return PTR_ERR(clk_info->jpegenc_clk);
+ }
+ }
+
+ pm_runtime_enable(&pdev->dev);
+
+ return ret;
+}
+
+void mtk_jpegenc_release_pm(struct mtk_jpeg_dev *mtkdev)
+{
+ struct platform_device *pdev = mtkdev->plat_dev;
+
+ pm_runtime_disable(&pdev->dev);
+}
+
+static int mtk_jpegenc_hw_init_irq(struct mtk_jpeg_dev *dev)
+{
+ struct platform_device *pdev = dev->plat_dev;
+ int ret;
+
+ dev->jpegenc_irq = platform_get_irq(pdev, 0);
+ if (dev->jpegenc_irq < 0) {
+ dev_err(&pdev->dev, "Failed to get irq resource");
+ return dev->jpegenc_irq;
+ }
+
+ ret = devm_request_irq(&pdev->dev, dev->jpegenc_irq,
+ mtk_jpegenc_hw_irq_handler, 0, pdev->name, dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to devm_request_irq %d (%d)",
+ dev->jpegenc_irq, ret);
+
+ return -ENOENT;
+ }
+
+ return 0;
+}
+
+static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
+{
+ struct mtk_jpeg_dev *dev;
+ int ret;
+
+ dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;
+ dev->plat_dev = pdev;
+ spin_lock_init(&dev->irqlock);
+ mutex_init(&dev->dev_mutex);
+ atomic_set(&dev->hw_rdy, 1U);
+ spin_lock_init(&dev->hw_lock);
+
+ dev->hw_state = MTK_JPEG_HW_IDLE;
+ INIT_DELAYED_WORK(&dev->job_timeout_work, mtk_jpegenc_timeout_work);
+
+ ret = mtk_jpegenc_init_pm(dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to get jpeg enc clock source");
+ return ret;
+ }
+
+ dev->reg_base[MTK_JPEGENC_HW0] =
+ devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR((__force void *)dev->reg_base[MTK_JPEGENC_HW0])) {
+ ret = PTR_ERR((__force void *)dev->reg_base[MTK_JPEGENC_HW0]);
+ goto err;
+ }
+
+ ret = mtk_jpegenc_hw_init_irq(dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to register JPEGENC irq handler.\n");
+ goto err;
+ }
+
+ platform_set_drvdata(pdev, dev);
+
+ ret = component_add(&pdev->dev, &mtk_jpegenc_hw_component_ops);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to component_add: %d\n", ret);
+ goto err;
+ }
+
+ return 0;
+
+err:
+ mtk_jpegenc_release_pm(dev);
+ return ret;
+}
+
+static int mtk_jpegenc_remove(struct platform_device *pdev)
+{
+ struct mtk_jpeg_dev *dev = platform_get_drvdata(pdev);
+
+ mtk_jpegenc_release_pm(dev);
+
+ return 0;
+}
+
#if defined(CONFIG_OF)
static const struct of_device_id mtk_jpegenc_hw_ids[] = {
{
@@ -164,3 +350,13 @@ static const struct of_device_id mtk_jpegenc_hw_ids[] = {
};
MODULE_DEVICE_TABLE(of, mtk_jpegenc_hw_ids);
#endif
+
+struct platform_driver mtk_jpegenc_hw_driver = {
+ .probe = mtk_jpegenc_hw_probe,
+ .remove = mtk_jpegenc_remove,
+ .driver = {
+ .name = "mtk-jpegenc-hw",
+ .of_match_table = of_match_ptr(mtk_jpegenc_hw_ids),
+ },
+};
+
Uses component framework to manage each hardware information which includes irq/power/clk. The hardware includes jpegenc0, jpegenc1. Signed-off-by: kyrie.wu <kyrie.wu@mediatek.com> --- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 185 +++++++++++++++++--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 16 +- drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 196 ++++++++++++++++++++++ 3 files changed, 372 insertions(+), 25 deletions(-)