@@ -8,10 +8,10 @@
#include <media/v4l2-event.h>
#include <media/v4l2-mem2mem.h>
#include <media/videobuf2-dma-contig.h>
-#include <linux/pm_runtime.h>
#include "mtk_vcodec_drv.h"
#include "mtk_vcodec_enc.h"
+#include "mtk_vcodec_enc_pm.h"
#include "mtk_vcodec_intr.h"
#include "mtk_vcodec_util.h"
#include "venc_drv_if.h"
@@ -877,8 +877,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
{
struct mtk_vcodec_ctx *ctx = vb2_get_drv_priv(q);
struct venc_enc_param param;
- int ret, pm_ret;
- int i;
+ int ret, i;
/* Once state turn into MTK_STATE_ABORT, we need stop_streaming
* to clear it
@@ -897,18 +896,12 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
return 0;
}
- ret = pm_runtime_resume_and_get(&ctx->dev->plat_dev->dev);
- if (ret < 0) {
- mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret);
- goto err_start_stream;
- }
-
mtk_venc_set_param(ctx, ¶m);
ret = venc_if_set_param(ctx, VENC_SET_PARAM_ENC, ¶m);
if (ret) {
mtk_v4l2_err("venc_if_set_param failed=%d", ret);
ctx->state = MTK_STATE_ABORT;
- goto err_set_param;
+ goto err_start_stream;
}
ctx->param_change = MTK_ENCODE_PARAM_NONE;
@@ -921,17 +914,19 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
if (ret) {
mtk_v4l2_err("venc_if_set_param failed=%d", ret);
ctx->state = MTK_STATE_ABORT;
- goto err_set_param;
+ goto err_start_stream;
}
ctx->state = MTK_STATE_HEADER;
}
- return 0;
+ ret = mtk_vcodec_enc_power_on(ctx);
+ if (ret) {
+ mtk_v4l2_err("mtk_vcodec_enc_power_on failed=%d", ret);
+ ctx->state = MTK_STATE_ABORT;
+ goto err_start_stream;
+ }
-err_set_param:
- pm_ret = pm_runtime_put(&ctx->dev->plat_dev->dev);
- if (pm_ret < 0)
- mtk_v4l2_err("pm_runtime_put fail %d", pm_ret);
+ return 0;
err_start_stream:
for (i = 0; i < q->num_buffers; ++i) {
@@ -1016,9 +1011,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)
if (ret)
mtk_v4l2_err("venc_if_deinit failed=%d", ret);
- ret = pm_runtime_put(&ctx->dev->plat_dev->dev);
- if (ret < 0)
- mtk_v4l2_err("pm_runtime_put fail %d", ret);
+ mtk_vcodec_enc_power_off(ctx);
ctx->state = MTK_STATE_FREE;
}
@@ -9,6 +9,7 @@
#include <linux/of_platform.h>
#include <linux/pm_runtime.h>
+#include "mtk_vcodec_enc_hw.h"
#include "mtk_vcodec_enc_pm.h"
#include "mtk_vcodec_util.h"
@@ -56,6 +57,88 @@ int mtk_vcodec_init_enc_clk(struct platform_device *pdev,
}
EXPORT_SYMBOL_GPL(mtk_vcodec_init_enc_clk);
+static int mtk_enc_core_power_on(struct mtk_vcodec_ctx *ctx)
+{
+ struct mtk_venc_hw_dev *sub_core;
+ int ret, i;
+
+ /* multi-core encoding need power on all available cores */
+ for (i = 0; i < MTK_VENC_HW_MAX; i++) {
+ sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[i];
+ if (!sub_core)
+ continue;
+
+ ret = pm_runtime_resume_and_get(&sub_core->plat_dev->dev);
+ if (ret) {
+ mtk_v4l2_err("power on sub_core[%d] fail %d", i, ret);
+ goto pm_on_fail;
+ }
+ }
+ return ret;
+
+pm_on_fail:
+ for (i -= 1; i >= 0; i--) {
+ sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[i];
+ pm_runtime_put_sync(&sub_core->plat_dev->dev);
+ }
+ return ret;
+}
+
+int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx)
+{
+ struct mtk_vcodec_pm *pm = &ctx->dev->pm;
+ int ret;
+
+ ret = pm_runtime_resume_and_get(pm->dev);
+ if (ret) {
+ mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret);
+ return ret;
+ }
+
+ if (IS_VENC_MULTICORE(ctx->dev->enc_capability)) {
+ ret = mtk_enc_core_power_on(ctx);
+ if (ret) {
+ mtk_v4l2_err("mtk_enc_core_power_on fail %d", ret);
+ goto core_error;
+ }
+ }
+ return ret;
+
+core_error:
+ pm_runtime_put_sync(pm->dev);
+ return ret;
+}
+
+static void mtk_enc_core_power_off(struct mtk_vcodec_ctx *ctx)
+{
+ struct mtk_venc_hw_dev *sub_core;
+ int ret, i;
+
+ /* multi-core encoding need power off all available cores */
+ for (i = 0; i < MTK_VENC_HW_MAX; i++) {
+ sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[i];
+ if (!sub_core)
+ continue;
+
+ ret = pm_runtime_put_sync(&sub_core->plat_dev->dev);
+ if (ret)
+ mtk_v4l2_err("power off sub_core[%d] fail %d", i, ret);
+ }
+}
+
+void mtk_vcodec_enc_power_off(struct mtk_vcodec_ctx *ctx)
+{
+ struct mtk_vcodec_pm *pm = &ctx->dev->pm;
+ int ret;
+
+ if (IS_VENC_MULTICORE(ctx->dev->enc_capability))
+ mtk_enc_core_power_off(ctx);
+
+ ret = pm_runtime_put_sync(pm->dev);
+ if (ret)
+ mtk_v4l2_err("pm_runtime_put_sync fail %d", ret);
+}
+
void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
{
struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
@@ -12,6 +12,8 @@
int mtk_vcodec_init_enc_clk(struct platform_device *pdev,
struct mtk_vcodec_pm *pm);
+int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx);
+void mtk_vcodec_enc_power_off(struct mtk_vcodec_ctx *ctx);
void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm);
void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm);
@@ -32,9 +32,7 @@ int venc_if_init(struct mtk_vcodec_ctx *ctx, unsigned int fourcc)
}
mtk_venc_lock(ctx);
- mtk_vcodec_enc_clock_on(&ctx->dev->pm);
ret = ctx->enc_if->init(ctx);
- mtk_vcodec_enc_clock_off(&ctx->dev->pm);
mtk_venc_unlock(ctx);
return ret;
@@ -46,9 +44,7 @@ int venc_if_set_param(struct mtk_vcodec_ctx *ctx,
int ret = 0;
mtk_venc_lock(ctx);
- mtk_vcodec_enc_clock_on(&ctx->dev->pm);
ret = ctx->enc_if->set_param(ctx->drv_handle, type, in);
- mtk_vcodec_enc_clock_off(&ctx->dev->pm);
mtk_venc_unlock(ctx);
return ret;
@@ -89,9 +85,7 @@ int venc_if_deinit(struct mtk_vcodec_ctx *ctx)
return 0;
mtk_venc_lock(ctx);
- mtk_vcodec_enc_clock_on(&ctx->dev->pm);
ret = ctx->enc_if->deinit(ctx->drv_handle);
- mtk_vcodec_enc_clock_off(&ctx->dev->pm);
mtk_venc_unlock(ctx);
ctx->drv_handle = NULL;
when enable multi-core encoding, all available encoder cores' power need to be on/off, add new functions for encoder cores' power management. Signed-off-by: Irui Wang <irui.wang@mediatek.com> --- .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 31 +++---- .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 83 +++++++++++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_pm.h | 2 + .../platform/mediatek/vcodec/venc_drv_if.c | 6 -- 4 files changed, 97 insertions(+), 25 deletions(-)