Commit 5797f7e1 authored by Yunfei Dong's avatar Yunfei Dong Committed by Mauro Carvalho Chehab

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

Generalizes power and clock on/off interfaces to support different
hardware.
Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent b199fe46
...@@ -46,7 +46,7 @@ static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv) ...@@ -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] + void __iomem *vdec_misc_addr = dev->reg_base[VDEC_MISC] +
VDEC_IRQ_CFG_REG; 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 */ /* check if HW active or not */
cg_status = readl(dev->reg_base[0]); cg_status = readl(dev->reg_base[0]);
...@@ -193,7 +193,7 @@ static int fops_vcodec_open(struct file *file) ...@@ -193,7 +193,7 @@ static int fops_vcodec_open(struct file *file)
mtk_vcodec_dec_set_default_params(ctx); mtk_vcodec_dec_set_default_params(ctx);
if (v4l2_fh_is_singular(&ctx->fh)) { 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) if (ret < 0)
goto err_load_fw; goto err_load_fw;
/* /*
...@@ -253,7 +253,7 @@ static int fops_vcodec_release(struct file *file) ...@@ -253,7 +253,7 @@ static int fops_vcodec_release(struct file *file)
mtk_vcodec_dec_release(ctx); mtk_vcodec_dec_release(ctx);
if (v4l2_fh_is_singular(&ctx->fh)) 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_del(&ctx->fh);
v4l2_fh_exit(&ctx->fh); v4l2_fh_exit(&ctx->fh);
v4l2_ctrl_handler_free(&ctx->ctrl_hdl); v4l2_ctrl_handler_free(&ctx->ctrl_hdl);
......
...@@ -65,7 +65,7 @@ static irqreturn_t mtk_vdec_hw_irq_handler(int irq, void *priv) ...@@ -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] + void __iomem *vdec_misc_addr = dev->reg_base[VDEC_HW_MISC] +
VDEC_IRQ_CFG_REG; 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 */ /* check if HW active or not */
cg_status = readl(dev->reg_base[VDEC_HW_SYS]); cg_status = readl(dev->reg_base[VDEC_HW_SYS]);
......
...@@ -35,6 +35,8 @@ enum mtk_vdec_hw_reg_idx { ...@@ -35,6 +35,8 @@ enum mtk_vdec_hw_reg_idx {
* @main_dev: main device * @main_dev: main device
* @reg_base: mapped address of MTK Vcodec registers. * @reg_base: mapped address of MTK Vcodec registers.
* *
* @curr_ctx: the context that is waiting for codec hardware
*
* @dec_irq : decoder irq resource * @dec_irq : decoder irq resource
* @pm : power management control * @pm : power management control
* @hw_idx : each hardware index * @hw_idx : each hardware index
...@@ -44,6 +46,8 @@ struct mtk_vdec_hw_dev { ...@@ -44,6 +46,8 @@ struct mtk_vdec_hw_dev {
struct mtk_vcodec_dev *main_dev; struct mtk_vcodec_dev *main_dev;
void __iomem *reg_base[VDEC_HW_MAX]; void __iomem *reg_base[VDEC_HW_MAX];
struct mtk_vcodec_ctx *curr_ctx;
int dec_irq; int dec_irq;
struct mtk_vcodec_pm pm; struct mtk_vcodec_pm pm;
int hw_idx; int hw_idx;
......
...@@ -5,11 +5,13 @@ ...@@ -5,11 +5,13 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/interrupt.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <soc/mediatek/smi.h> #include <soc/mediatek/smi.h>
#include "mtk_vcodec_dec_hw.h"
#include "mtk_vcodec_dec_pm.h" #include "mtk_vcodec_dec_pm.h"
#include "mtk_vcodec_util.h" #include "mtk_vcodec_util.h"
...@@ -85,10 +87,23 @@ void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm) ...@@ -85,10 +87,23 @@ void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm)
} }
EXPORT_SYMBOL_GPL(mtk_vcodec_release_dec_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; 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); ret = pm_runtime_resume_and_get(pm->dev);
if (ret) if (ret)
mtk_v4l2_err("pm_runtime_resume_and_get fail %d", 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) ...@@ -97,21 +112,50 @@ int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)
} }
EXPORT_SYMBOL_GPL(mtk_vcodec_dec_pw_on); 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; 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); ret = pm_runtime_put_sync(pm->dev);
if (ret) if (ret)
mtk_v4l2_err("pm_runtime_put_sync fail %d", ret); mtk_v4l2_err("pm_runtime_put_sync fail %d", ret);
} }
EXPORT_SYMBOL_GPL(mtk_vcodec_dec_pw_off); 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; struct mtk_vdec_hw_dev *subdev_dev;
int ret, i = 0; 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++) { for (i = 0; i < dec_clk->clk_num; i++) {
ret = clk_prepare_enable(dec_clk->clk_info[i].vcodec_clk); ret = clk_prepare_enable(dec_clk->clk_info[i].vcodec_clk);
if (ret) { if (ret) {
...@@ -134,11 +178,27 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm) ...@@ -134,11 +178,27 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm)
} }
EXPORT_SYMBOL_GPL(mtk_vcodec_dec_clock_on); 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; struct mtk_vdec_hw_dev *subdev_dev;
int i = 0; 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); mtk_smi_larb_put(pm->larbvdec);
for (i = dec_clk->clk_num - 1; i >= 0; i--) for (i = dec_clk->clk_num - 1; i >= 0; i--)
clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk); clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk);
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
int mtk_vcodec_init_dec_pm(struct platform_device *pdev, struct mtk_vcodec_pm *pm); 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); void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *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);
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);
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);
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);
#endif /* _MTK_VCODEC_DEC_PM_H_ */ #endif /* _MTK_VCODEC_DEC_PM_H_ */
...@@ -284,6 +284,7 @@ struct vdec_pic_info { ...@@ -284,6 +284,7 @@ struct vdec_pic_info {
* @decoded_frame_cnt: number of decoded frames * @decoded_frame_cnt: number of decoded frames
* @lock: protect variables accessed by V4L2 threads and worker thread such as * @lock: protect variables accessed by V4L2 threads and worker thread such as
* mtk_video_dec_buf. * mtk_video_dec_buf.
* @hw_id: hardware index used to identify different hardware.
* *
* @msg_queue: msg queue used to store lat buffer information. * @msg_queue: msg queue used to store lat buffer information.
*/ */
...@@ -328,6 +329,7 @@ struct mtk_vcodec_ctx { ...@@ -328,6 +329,7 @@ struct mtk_vcodec_ctx {
int decoded_frame_cnt; int decoded_frame_cnt;
struct mutex lock; struct mutex lock;
int hw_id;
struct vdec_msg_queue msg_queue; struct vdec_msg_queue msg_queue;
}; };
......
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
*/ */
#include <linux/module.h> #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_drv.h"
#include "mtk_vcodec_util.h" #include "mtk_vcodec_util.h"
...@@ -71,25 +74,59 @@ void mtk_vcodec_mem_free(struct mtk_vcodec_ctx *data, ...@@ -71,25 +74,59 @@ void mtk_vcodec_mem_free(struct mtk_vcodec_ctx *data,
} }
EXPORT_SYMBOL(mtk_vcodec_mem_free); EXPORT_SYMBOL(mtk_vcodec_mem_free);
void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *dev, void *mtk_vcodec_get_hw_dev(struct mtk_vcodec_dev *dev, int hw_idx)
struct mtk_vcodec_ctx *ctx)
{ {
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); void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *vdec_dev,
dev->curr_ctx = ctx; struct mtk_vcodec_ctx *ctx, int hw_idx)
spin_unlock_irqrestore(&dev->irqlock, flags); {
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); 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; unsigned long flags;
struct mtk_vcodec_ctx *ctx; struct mtk_vcodec_ctx *ctx;
struct mtk_vdec_hw_dev *subdev_dev;
spin_lock_irqsave(&dev->irqlock, flags);
ctx = dev->curr_ctx; spin_lock_irqsave(&vdec_dev->irqlock, flags);
spin_unlock_irqrestore(&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; return ctx;
} }
EXPORT_SYMBOL(mtk_vcodec_get_curr_ctx); EXPORT_SYMBOL(mtk_vcodec_get_curr_ctx);
......
...@@ -54,8 +54,10 @@ int mtk_vcodec_mem_alloc(struct mtk_vcodec_ctx *data, ...@@ -54,8 +54,10 @@ int mtk_vcodec_mem_alloc(struct mtk_vcodec_ctx *data,
struct mtk_vcodec_mem *mem); struct mtk_vcodec_mem *mem);
void mtk_vcodec_mem_free(struct mtk_vcodec_ctx *data, void mtk_vcodec_mem_free(struct mtk_vcodec_ctx *data,
struct mtk_vcodec_mem *mem); struct mtk_vcodec_mem *mem);
void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *dev, void mtk_vcodec_set_curr_ctx(struct mtk_vcodec_dev *vdec_dev,
struct mtk_vcodec_ctx *ctx); struct mtk_vcodec_ctx *ctx, int hw_idx);
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);
void *mtk_vcodec_get_hw_dev(struct mtk_vcodec_dev *dev, int hw_idx);
#endif /* _MTK_VCODEC_UTIL_H_ */ #endif /* _MTK_VCODEC_UTIL_H_ */
...@@ -24,21 +24,24 @@ int vdec_if_init(struct mtk_vcodec_ctx *ctx, unsigned int fourcc) ...@@ -24,21 +24,24 @@ int vdec_if_init(struct mtk_vcodec_ctx *ctx, unsigned int fourcc)
break; break;
case V4L2_PIX_FMT_H264: case V4L2_PIX_FMT_H264:
ctx->dec_if = &vdec_h264_if; ctx->dec_if = &vdec_h264_if;
ctx->hw_id = MTK_VDEC_CORE;
break; break;
case V4L2_PIX_FMT_VP8: case V4L2_PIX_FMT_VP8:
ctx->dec_if = &vdec_vp8_if; ctx->dec_if = &vdec_vp8_if;
ctx->hw_id = MTK_VDEC_CORE;
break; break;
case V4L2_PIX_FMT_VP9: case V4L2_PIX_FMT_VP9:
ctx->dec_if = &vdec_vp9_if; ctx->dec_if = &vdec_vp9_if;
ctx->hw_id = MTK_VDEC_CORE;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
mtk_vdec_lock(ctx); 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); 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); mtk_vdec_unlock(ctx);
return ret; return ret;
...@@ -69,13 +72,11 @@ int vdec_if_decode(struct mtk_vcodec_ctx *ctx, struct mtk_vcodec_mem *bs, ...@@ -69,13 +72,11 @@ int vdec_if_decode(struct mtk_vcodec_ctx *ctx, struct mtk_vcodec_mem *bs,
mtk_vdec_lock(ctx); mtk_vdec_lock(ctx);
mtk_vcodec_set_curr_ctx(ctx->dev, ctx); mtk_vcodec_set_curr_ctx(ctx->dev, ctx, ctx->hw_id);
mtk_vcodec_dec_clock_on(&ctx->dev->pm); mtk_vcodec_dec_clock_on(ctx->dev, ctx->hw_id);
enable_irq(ctx->dev->dec_irq);
ret = ctx->dec_if->decode(ctx->drv_handle, bs, fb, res_chg); 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, ctx->hw_id);
mtk_vcodec_dec_clock_off(&ctx->dev->pm); mtk_vcodec_set_curr_ctx(ctx->dev, NULL, ctx->hw_id);
mtk_vcodec_set_curr_ctx(ctx->dev, NULL);
mtk_vdec_unlock(ctx); mtk_vdec_unlock(ctx);
...@@ -103,9 +104,9 @@ void vdec_if_deinit(struct mtk_vcodec_ctx *ctx) ...@@ -103,9 +104,9 @@ void vdec_if_deinit(struct mtk_vcodec_ctx *ctx)
return; return;
mtk_vdec_lock(ctx); 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); 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); mtk_vdec_unlock(ctx);
ctx->drv_handle = NULL; ctx->drv_handle = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment