@@ -13,6 +13,7 @@
#include "mtk_vcodec_drv.h"
#include "mtk_vcodec_enc.h"
#include "mtk_vcodec_enc_core.h"
+#include "mtk_vcodec_enc_pm.h"
#include "mtk_vcodec_intr.h"
static const struct of_device_id mtk_venc_core_ids[] = {
@@ -117,6 +118,13 @@ static int mtk_venc_core_probe(struct platform_device *pdev)
return dev_err_probe(dev, -EINVAL,
"Invalid core id %d\n", core->core_id);
+ ret = mtk_vcodec_init_enc_clk(core->plat_dev, &core->pm);
+ if (ret < 0)
+ return dev_err_probe(dev, ret,
+ "Failed to get venc core clock source!");
+
+ pm_runtime_enable(&pdev->dev);
+
main_dev->enc_core_dev[core->core_id] = core;
core->main_dev = main_dev;
@@ -272,7 +272,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
}
if (!dev->venc_multi_core) {
- ret = mtk_vcodec_init_enc_clk(dev);
+ ret = mtk_vcodec_init_enc_clk(dev->plat_dev, &dev->pm);
if (ret < 0) {
dev_err(&pdev->dev,
"Failed to get mtk vcodec clock source!");
@@ -12,17 +12,13 @@
#include "mtk_vcodec_enc_pm.h"
#include "mtk_vcodec_util.h"
-int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *mtkdev)
+int mtk_vcodec_init_enc_clk(struct platform_device *pdev,
+ struct mtk_vcodec_pm *pm)
{
- struct platform_device *pdev;
- struct mtk_vcodec_pm *pm;
struct mtk_vcodec_clk *enc_clk;
struct mtk_vcodec_clk_info *clk_info;
int ret, i;
- pdev = mtkdev->plat_dev;
- pm = &mtkdev->pm;
- memset(pm, 0, sizeof(struct mtk_vcodec_pm));
pm->dev = &pdev->dev;
enc_clk = &pm->venc_clk;
@@ -9,8 +9,8 @@
#include "mtk_vcodec_drv.h"
-int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *dev);
-
+int mtk_vcodec_init_enc_clk(struct platform_device *pdev,
+ struct mtk_vcodec_pm *pm);
void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm);
void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm);
The args "struct mtk_vcodec_dev *" doesn't appropriate for init_clk functions because of sub-devices. For main device, it has no "pm/clk" properties in dtsi, sub-devices will init their own "pm/clk" instead. So rewrite the pm interface with args "platform_device *" and "mtk_vcodec_pm*". Signed-off-by: Irui Wang <irui.wang@mediatek.com> --- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_core.c | 8 ++++++++ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 8 ++------ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-)