media: mtk-vcodec: Generalize power and clock on/off interfaces

Generalizes power and clock on/off interfaces to support different
hardware.

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index 40d1f16a0a250911fbe5c3991f6e5832969bbdc5..ffc4ba698876ed3013d3d59bf73bba827c777539 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -46,7 +46,7 @@ static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv)
        void __iomem *vdec_misc_addr = dev->reg_base[VDEC_MISC] +
                                        VDEC_IRQ_CFG_REG;
 
-       ctx = mtk_vcodec_get_curr_ctx(dev);
+       ctx = mtk_vcodec_get_curr_ctx(dev, MTK_VDEC_CORE);
 
        /* check if HW active or not */
        cg_status = readl(dev->reg_base[0]);
@@ -193,7 +193,7 @@ static int fops_vcodec_open(struct file *file)
        mtk_vcodec_dec_set_default_params(ctx);
 
        if (v4l2_fh_is_singular(&ctx->fh)) {
-               ret = mtk_vcodec_dec_pw_on(&dev->pm);
+               ret = mtk_vcodec_dec_pw_on(dev, MTK_VDEC_LAT0);
                if (ret < 0)
                        goto err_load_fw;
                /*
@@ -253,7 +253,7 @@ static int fops_vcodec_release(struct file *file)
        mtk_vcodec_dec_release(ctx);
 
        if (v4l2_fh_is_singular(&ctx->fh))
-               mtk_vcodec_dec_pw_off(&dev->pm);
+               mtk_vcodec_dec_pw_off(dev, MTK_VDEC_LAT0);
        v4l2_fh_del(&ctx->fh);
        v4l2_fh_exit(&ctx->fh);
        v4l2_ctrl_handler_free(&ctx->ctrl_hdl);

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
index 6b248dd94dd3969a7a99179782f26eaae38a913c..f2f5d8869c70eb0c361f0b0059312fa89714ed77 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
@@ -65,7 +65,7 @@ static irqreturn_t mtk_vdec_hw_irq_handler(int irq, void *priv)
        void __iomem *vdec_misc_addr = dev->reg_base[VDEC_HW_MISC] +
                                        VDEC_IRQ_CFG_REG;
 
-       ctx = mtk_vcodec_get_curr_ctx(dev->main_dev);
+       ctx = mtk_vcodec_get_curr_ctx(dev->main_dev, dev->hw_idx);
 
        /* check if HW active or not */
        cg_status = readl(dev->reg_base[VDEC_HW_SYS]);

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
index 5c2cfeaa9d9f59390d8c2e1ed41183db1338315c..a63e4b1b81c3e4a0f5c974027571eb6decf2ef5d 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
@@ -35,6 +35,8 @@ enum mtk_vdec_hw_reg_idx {
  * @main_dev: main device
  * @reg_base: mapped address of MTK Vcodec registers.
  *
+ * @curr_ctx: the context that is waiting for codec hardware
+ *
  * @dec_irq : decoder irq resource
  * @pm      : power management control
  * @hw_idx  : each hardware index
@@ -44,6 +46,8 @@ struct mtk_vdec_hw_dev {
        struct mtk_vcodec_dev *main_dev;
        void __iomem *reg_base[VDEC_HW_MAX];
 
+       struct mtk_vcodec_ctx *curr_ctx;
+
        int dec_irq;
        struct mtk_vcodec_pm pm;
        int hw_idx;

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
index 64535d33bff8757ad6ca7156bac0f5652e9cf556..f5b1e1aab301d3f0cc696c2d2bac10ed471c9ed9 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
@@ -5,11 +5,13 @@
  */
 
 #include <linux/clk.h>
+#include <linux/interrupt.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/pm_runtime.h>
 #include <soc/mediatek/smi.h>
 
+#include "mtk_vcodec_dec_hw.h"
 #include "mtk_vcodec_dec_pm.h"
 #include "mtk_vcodec_util.h"
 
@@ -85,10 +87,23 @@ void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm)
 }
 EXPORT_SYMBOL_GPL(mtk_vcodec_release_dec_pm);
 
-int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)
+int mtk_vcodec_dec_pw_on(struct mtk_vcodec_dev *vdec_dev, int hw_idx)
 {
+       struct mtk_vdec_hw_dev *subdev_dev;
+       struct mtk_vcodec_pm *pm;
        int ret;
 
+       if (vdec_dev->vdec_pdata->is_subdev_supported) {
+               subdev_dev = mtk_vcodec_get_hw_dev(vdec_dev, hw_idx);
+               if (!subdev_dev) {
+                       mtk_v4l2_err("Failed to get hw dev\n");
+                       return -EINVAL;
+               }
+               pm = &subdev_dev->pm;
+       } else {
+               pm = &vdec_dev->pm;
+       }
+
        ret = pm_runtime_resume_and_get(pm->dev);
        if (ret)
                mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret);
@@ -97,21 +112,50 @@ int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)
 }
 EXPORT_SYMBOL_GPL(mtk_vcodec_dec_pw_on);
 
-void mtk_vcodec_dec_pw_off(struct mtk_vcodec_pm *pm)
+void mtk_vcodec_dec_pw_off(struct mtk_vcodec_dev *vdec_dev, int hw_idx)
 {
+       struct mtk_vdec_hw_dev *subdev_dev;
+       struct mtk_vcodec_pm *pm;
        int ret;
 
+       if (vdec_dev->vdec_pdata->is_subdev_supported) {
+               subdev_dev = mtk_vcodec_get_hw_dev(vdec_dev, hw_idx);
+               if (!subdev_dev) {
+                       mtk_v4l2_err("Failed to get hw dev\n");
+                       return;
+               }
+               pm = &subdev_dev->pm;
+       } else {
+               pm = &vdec_dev->pm;
+       }
+
        ret = pm_runtime_put_sync(pm->dev);
        if (ret)
                mtk_v4l2_err("pm_runtime_put_sync fail %d", ret);
 }
 EXPORT_SYMBOL_GPL(mtk_vcodec_dec_pw_off);
 
-void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm)
+void mtk_vcodec_dec_clock_on(struct mtk_vcodec_dev *vdec_dev, int hw_idx)
 {
-       struct mtk_vcodec_clk *dec_clk = &pm->vdec_clk;
-       int ret, i = 0;
+       struct mtk_vdec_hw_dev *subdev_dev;
+       struct mtk_vcodec_pm *pm;
+       struct mtk_vcodec_clk *dec_clk;
+       int ret, i;
+
+       if (vdec_dev->vdec_pdata->is_subdev_supported) {
+               subdev_dev = mtk_vcodec_get_hw_dev(vdec_dev, hw_idx);
+               if (!subdev_dev) {
+                       mtk_v4l2_err("Failed to get hw dev\n");
+                       return;
+               }
+               pm = &subdev_dev->pm;
+               enable_irq(subdev_dev->dec_irq);
+       } else {
+               pm = &vdec_dev->pm;
+               enable_irq(vdec_dev->dec_irq);
+       }
 
+       dec_clk = &pm->vdec_clk;
        for (i = 0; i < dec_clk->clk_num; i++) {
                ret = clk_prepare_enable(dec_clk->clk_info[i].vcodec_clk);
                if (ret) {
@@ -134,11 +178,27 @@ error:
 }
 EXPORT_SYMBOL_GPL(mtk_vcodec_dec_clock_on);
 
-void mtk_vcodec_dec_clock_off(struct mtk_vcodec_pm *pm)
+void mtk_vcodec_dec_clock_off(struct mtk_vcodec_dev *vdec_dev, int hw_idx)
 {
-       struct mtk_vcodec_clk *dec_clk = &pm->vdec_clk;
-       int i = 0;
+       struct mtk_vdec_hw_dev *subdev_dev;
+       struct mtk_vcodec_pm *pm;
+       struct mtk_vcodec_clk *dec_clk;
+       int i;
 
+       if (vdec_dev->vdec_pdata->is_subdev_supported) {
+               subdev_dev = mtk_vcodec_get_hw_dev(vdec_dev, hw_idx);
+               if (!subdev_dev) {
+                       mtk_v4l2_err("Failed to get hw dev\n");
+                       return;
+               }
+               pm = &subdev_dev->pm;
+               disable_irq(subdev_dev->dec_irq);
+       } else {
+               pm = &vdec_dev->pm;
+               disable_irq(vdec_dev->dec_irq);
+       }
+
+       dec_clk = &pm->vdec_clk;
        mtk_smi_larb_put(pm->larbvdec);
        for (i = dec_clk->clk_num - 1; i >= 0; i--)
                clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk);

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
index 08769c7648ebc64e6c38dde5687651d1c22a8e49..ff979d384f4c386f4b022a12086006edbb0a458e 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
@@ -12,9 +12,9 @@
 int mtk_vcodec_init_dec_pm(struct platform_device *pdev, struct mtk_vcodec_pm *pm);
 void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm);
 
-int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm);
-void mtk_vcodec_dec_pw_off(struct mtk_vcodec_pm *pm);
-void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm);
-void mtk_vcodec_dec_clock_off(struct mtk_vcodec_pm *pm);
+int mtk_vcodec_dec_pw_on(struct mtk_vcodec_dev *vdec_dev, int hw_idx);
+void mtk_vcodec_dec_pw_off(struct mtk_vcodec_dev *vdec_dev, int hw_idx);
+void mtk_vcodec_dec_clock_on(struct mtk_vcodec_dev *vdec_dev, int hw_idx);
+void mtk_vcodec_dec_clock_off(struct mtk_vcodec_dev *vdec_dev, int hw_idx);
 
 #endif /* _MTK_VCODEC_DEC_PM_H_ */

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index c9a377035e8096ca3e108139bbf3d9f59121739e..4d3fd2a7a56eee94cbc08f6c4f4d525c582c087e 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -284,6 +284,7 @@ struct vdec_pic_info {
  * @decoded_frame_cnt: number of decoded frames
  * @lock: protect variables accessed by V4L2 threads and worker thread such as
  *       mtk_video_dec_buf.
+ * @hw_id: hardware index used to identify different hardware.
  *
  * @msg_queue: msg queue used to store lat buffer information.
  */
@@ -328,6 +329,7 @@ struct mtk_vcodec_ctx {
 
        int decoded_frame_cnt;
        struct mutex lock;
+       int hw_id;
 
        struct vdec_msg_queue msg_queue;
 };

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
index 5bac820a47fc45e5b480a107336bf97f73e9aef9..ace78c4b5b9eabfb4c38af667006401275cfdf64 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
@@ -6,7 +6,10 @@
 */
 
 #include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
+#include "mtk_vcodec_dec_hw.h"
 #include "mtk_vcodec_drv.h"
 #include "mtk_vcodec_util.h"
 
@@ -71,25 +74,59 @@ void mtk_vcodec_mem_free(struct mtk_vcodec_ctx *data,
 }
 EXPORT_SYMBOL(mtk_vcodec_mem_free);
 
-void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *dev,
-       struct mtk_vcodec_ctx *ctx)
+void *mtk_vcodec_get_hw_dev(struct mtk_vcodec_dev *dev, int hw_idx)
 {
-       unsigned long flags;
+       if (hw_idx >= MTK_VDEC_HW_MAX || hw_idx < 0 || !dev->subdev_dev[hw_idx]) {
+               mtk_v4l2_err("hw idx is out of range:%d", hw_idx);
+               return NULL;
+       }
+
+       return dev->subdev_dev[hw_idx];
+}
+EXPORT_SYMBOL(mtk_vcodec_get_hw_dev);
 
-       spin_lock_irqsave(&dev->irqlock, flags);
-       dev->curr_ctx = ctx;
-       spin_unlock_irqrestore(&dev->irqlock, flags);
+void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *vdec_dev,
+                            struct mtk_vcodec_ctx *ctx, int hw_idx)
+{
+       unsigned long flags;
+       struct mtk_vdec_hw_dev *subdev_dev;
+
+       spin_lock_irqsave(&vdec_dev->irqlock, flags);
+       if (vdec_dev->vdec_pdata->is_subdev_supported) {
+               subdev_dev = mtk_vcodec_get_hw_dev(vdec_dev, hw_idx);
+               if (!subdev_dev) {
+                       mtk_v4l2_err("Failed to get hw dev");
+                       spin_unlock_irqrestore(&vdec_dev->irqlock, flags);
+                       return;
+               }
+               subdev_dev->curr_ctx = ctx;
+       } else {
+               vdec_dev->curr_ctx = ctx;
+       }
+       spin_unlock_irqrestore(&vdec_dev->irqlock, flags);
 }
 EXPORT_SYMBOL(mtk_vcodec_set_curr_ctx);
 
-struct mtk_vcodec_ctx *mtk_vcodec_get_curr_ctx(struct mtk_vcodec_dev *dev)
+struct mtk_vcodec_ctx *mtk_vcodec_get_curr_ctx(struct mtk_vcodec_dev *vdec_dev,
+                                              unsigned int hw_idx)
 {
        unsigned long flags;
        struct mtk_vcodec_ctx *ctx;
-
-       spin_lock_irqsave(&dev->irqlock, flags);
-       ctx = dev->curr_ctx;
-       spin_unlock_irqrestore(&dev->irqlock, flags);
+       struct mtk_vdec_hw_dev *subdev_dev;
+
+       spin_lock_irqsave(&vdec_dev->irqlock, flags);
+       if (vdec_dev->vdec_pdata->is_subdev_supported) {
+               subdev_dev = mtk_vcodec_get_hw_dev(vdec_dev, hw_idx);
+               if (!subdev_dev) {
+                       mtk_v4l2_err("Failed to get hw dev");
+                       spin_unlock_irqrestore(&vdec_dev->irqlock, flags);
+                       return NULL;
+               }
+               ctx = subdev_dev->curr_ctx;
+       } else {
+               ctx = vdec_dev->curr_ctx;
+       }
+       spin_unlock_irqrestore(&vdec_dev->irqlock, flags);
        return ctx;
 }
 EXPORT_SYMBOL(mtk_vcodec_get_curr_ctx);

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
index 87c3d6d4bfa77a37eaf56dd89b360945881f71eb..71956627a0e2ba7c2e82a5a96264d4ec8bda7b69 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
@@ -54,8 +54,10 @@ int mtk_vcodec_mem_alloc(struct mtk_vcodec_ctx *data,
                                struct mtk_vcodec_mem *mem);
 void mtk_vcodec_mem_free(struct mtk_vcodec_ctx *data,
                                struct mtk_vcodec_mem *mem);
-void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *dev,
-       struct mtk_vcodec_ctx *ctx);
-struct mtk_vcodec_ctx *mtk_vcodec_get_curr_ctx(struct mtk_vcodec_dev *dev);
+void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *vdec_dev,
+                            struct mtk_vcodec_ctx *ctx, int hw_idx);
+struct mtk_vcodec_ctx *mtk_vcodec_get_curr_ctx(struct mtk_vcodec_dev *vdec_dev,
+                                              unsigned int hw_idx);
+void *mtk_vcodec_get_hw_dev(struct mtk_vcodec_dev *dev, int hw_idx);
 
 #endif /* _MTK_VCODEC_UTIL_H_ */

diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mtk-vcodec/vdec_drv_if.c
index 42008243ceac1cab8fa3c9676fb5a7c7a2049f81..05a5b240e906f5a2367eb4b05347c189abe5aa60 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec_drv_if.c
@@ -24,21 +24,24 @@ int vdec_if_init(struct mtk_vcodec_ctx *ctx, unsigned int fourcc)
                break;
        case V4L2_PIX_FMT_H264:
                ctx->dec_if = &vdec_h264_if;
+               ctx->hw_id = MTK_VDEC_CORE;
                break;
        case V4L2_PIX_FMT_VP8:
                ctx->dec_if = &vdec_vp8_if;
+               ctx->hw_id = MTK_VDEC_CORE;
                break;
        case V4L2_PIX_FMT_VP9:
                ctx->dec_if = &vdec_vp9_if;
+               ctx->hw_id = MTK_VDEC_CORE;
                break;
        default:
                return -EINVAL;
        }
 
        mtk_vdec_lock(ctx);
-       mtk_vcodec_dec_clock_on(&ctx->dev->pm);
+       mtk_vcodec_dec_clock_on(ctx->dev, ctx->hw_id);
        ret = ctx->dec_if->init(ctx);
-       mtk_vcodec_dec_clock_off(&ctx->dev->pm);
+       mtk_vcodec_dec_clock_off(ctx->dev, ctx->hw_id);
        mtk_vdec_unlock(ctx);
 
        return ret;
@@ -69,13 +72,11 @@ int vdec_if_decode(struct mtk_vcodec_ctx *ctx, struct mtk_vcodec_mem *bs,
 
        mtk_vdec_lock(ctx);
 
-       mtk_vcodec_set_curr_ctx(ctx->dev, ctx);
-       mtk_vcodec_dec_clock_on(&ctx->dev->pm);
-       enable_irq(ctx->dev->dec_irq);
+       mtk_vcodec_set_curr_ctx(ctx->dev, ctx, ctx->hw_id);
+       mtk_vcodec_dec_clock_on(ctx->dev, ctx->hw_id);
        ret = ctx->dec_if->decode(ctx->drv_handle, bs, fb, res_chg);
-       disable_irq(ctx->dev->dec_irq);
-       mtk_vcodec_dec_clock_off(&ctx->dev->pm);
-       mtk_vcodec_set_curr_ctx(ctx->dev, NULL);
+       mtk_vcodec_dec_clock_off(ctx->dev, ctx->hw_id);
+       mtk_vcodec_set_curr_ctx(ctx->dev, NULL, ctx->hw_id);
 
        mtk_vdec_unlock(ctx);
 
@@ -103,9 +104,9 @@ void vdec_if_deinit(struct mtk_vcodec_ctx *ctx)
                return;
 
        mtk_vdec_lock(ctx);
-       mtk_vcodec_dec_clock_on(&ctx->dev->pm);
+       mtk_vcodec_dec_clock_on(ctx->dev, ctx->hw_id);
        ctx->dec_if->deinit(ctx->drv_handle);
-       mtk_vcodec_dec_clock_off(&ctx->dev->pm);
+       mtk_vcodec_dec_clock_off(ctx->dev, ctx->hw_id);
        mtk_vdec_unlock(ctx);
 
        ctx->drv_handle = NULL;