lkml.org 
[lkml]   [2021]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/9] media: mtk-vcodec: Add venc power on/off interface
    Date
    Frame-racing mode need power on/off all venc available power,
    pm_runtime_xx helper is not appropriate called directly, add new
    power on/off interface for it.

    Signed-off-by: Irui Wang <irui.wang@mediatek.com>
    ---
    .../platform/mtk-vcodec/mtk_vcodec_enc.c | 18 +---
    .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 9 +-
    .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 82 +++++++++++++++++++
    .../platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 4 +
    4 files changed, 96 insertions(+), 17 deletions(-)

    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
    index 416f356af363..d22f9c8fd063 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
    @@ -16,6 +16,7 @@
    #include "mtk_vcodec_intr.h"
    #include "mtk_vcodec_util.h"
    #include "venc_drv_if.h"
    +#include "mtk_vcodec_enc_pm.h"

    #define MTK_VENC_MIN_W 160U
    #define MTK_VENC_MIN_H 128U
    @@ -801,7 +802,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
    */
    if ((ctx->state == MTK_STATE_ABORT) || (ctx->state == MTK_STATE_FREE)) {
    ret = -EIO;
    - goto err_start_stream;
    + goto err_set_param;
    }

    /* Do the initialization when both start_streaming have been called */
    @@ -813,12 +814,6 @@ 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, &param);
    ret = venc_if_set_param(ctx, VENC_SET_PARAM_ENC, &param);
    if (ret) {
    @@ -845,11 +840,6 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
    return 0;

    err_set_param:
    - ret = pm_runtime_put(&ctx->dev->plat_dev->dev);
    - if (ret < 0)
    - mtk_v4l2_err("pm_runtime_put fail %d", ret);
    -
    -err_start_stream:
    for (i = 0; i < q->num_buffers; ++i) {
    struct vb2_buffer *buf = vb2_get_buffer(q, i);

    @@ -903,10 +893,6 @@ 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);
    -
    ctx->state = MTK_STATE_FREE;
    }

    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
    index 9c2224b199d0..b78435e8223a 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
    @@ -253,6 +253,12 @@ static int fops_vcodec_open(struct file *file)
    mtk_v4l2_debug(0, "encoder capability %x", dev->enc_capability);
    }

    + ret = mtk_vcodec_enc_power_on(ctx);
    + if (ret < 0) {
    + mtk_v4l2_err("encoder power on failed %d", ret);
    + goto err_load_fw;
    + }
    +
    mtk_v4l2_debug(2, "Create instance [%d]@%p m2m_ctx=%p ",
    ctx->id, ctx, ctx->m2m_ctx);

    @@ -285,11 +291,12 @@ static int fops_vcodec_release(struct file *file)
    mtk_v4l2_debug(1, "[%d] encoder", ctx->id);
    mutex_lock(&dev->dev_mutex);

    + v4l2_m2m_ctx_release(ctx->m2m_ctx);
    mtk_vcodec_enc_release(ctx);
    v4l2_fh_del(&ctx->fh);
    v4l2_fh_exit(&ctx->fh);
    v4l2_ctrl_handler_free(&ctx->ctrl_hdl);
    - v4l2_m2m_ctx_release(ctx->m2m_ctx);
    + mtk_vcodec_enc_power_off(ctx);

    list_del_init(&ctx->list);
    kfree(ctx);
    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
    index 5edeb93fca84..d9df0e3701f1 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
    @@ -12,6 +12,7 @@

    #include "mtk_vcodec_enc_pm.h"
    #include "mtk_vcodec_util.h"
    +#include "mtk_vcodec_enc_hw.h"

    int mtk_vcodec_init_enc_pm(struct platform_device *pdev,
    struct mtk_vcodec_pm *pm)
    @@ -120,3 +121,84 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
    for (i = enc_clk->clk_num - 1; i >= 0; i--)
    clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
    }
    +
    +int mtk_venc_enable_comp_hw(struct mtk_vcodec_dev *dev)
    +{
    + int i, ret;
    + struct mtk_venc_comp_dev *venc_comp;
    +
    + /*
    + * frame_racing mode needs power on all available component devices.
    + */
    + for (i = 0; i < MTK_VENC_HW_MAX; i++) {
    + venc_comp = (struct mtk_venc_comp_dev *)dev->enc_comp_dev[i];
    + if (!venc_comp)
    + return 0;
    +
    + ret = mtk_smi_larb_get(venc_comp->pm.larbvenc);
    + if (ret < 0) {
    + mtk_v4l2_err("power on core[%d] fail %d", i, ret);
    + goto pw_err;
    + }
    + }
    + return 0;
    +
    +pw_err:
    + for (i -= 1; i >= 0; i--) {
    + venc_comp = (struct mtk_venc_comp_dev *)dev->enc_comp_dev[i];
    +
    + mtk_smi_larb_put(venc_comp->pm.larbvenc);
    + }
    +
    + return ret;
    +}
    +
    +int mtk_venc_disable_comp_hw(struct mtk_vcodec_dev *dev)
    +{
    + int i;
    + struct mtk_venc_comp_dev *venc_comp;
    +
    + /*power off all available component device*/
    + for (i = 0; i < MTK_VENC_HW_MAX; i++) {
    + venc_comp = (struct mtk_venc_comp_dev *)dev->enc_comp_dev[i];
    + if (!venc_comp)
    + return 0;
    +
    + mtk_smi_larb_put(venc_comp->pm.larbvenc);
    + }
    +
    + return 0;
    +}
    +
    +int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx)
    +{
    + int ret;
    + struct mtk_vcodec_dev *dev = ctx->dev;
    +
    + if (dev->venc_pdata->hw_mode == VENC_FRAME_RACING_MODE) {
    + ret = mtk_venc_enable_comp_hw(dev);
    + if (ret < 0) {
    + mtk_v4l2_err("enable venc comp hw fail :%d", ret);
    + return ret;
    + }
    + } else {
    + ret = mtk_smi_larb_get(dev->pm.larbvenc);
    + if (ret < 0) {
    + mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret);
    + return ret;
    + }
    + }
    + return 0;
    +}
    +
    +int mtk_vcodec_enc_power_off(struct mtk_vcodec_ctx *ctx)
    +{
    + struct mtk_vcodec_dev *dev = ctx->dev;
    +
    + if (dev->venc_pdata->hw_mode == VENC_FRAME_RACING_MODE)
    + mtk_venc_disable_comp_hw(dev);
    + else
    + mtk_smi_larb_put(dev->pm.larbvenc);
    +
    + return 0;
    +}
    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
    index f4a4aa441185..2e76b858fed1 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
    @@ -16,4 +16,8 @@ void mtk_vcodec_release_enc_pm(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);

    +int mtk_venc_enable_comp_hw(struct mtk_vcodec_dev *dev);
    +int mtk_venc_disable_comp_hw(struct mtk_vcodec_dev *dev);
    +int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx);
    +int mtk_vcodec_enc_power_off(struct mtk_vcodec_ctx *ctx);
    #endif /* _MTK_VCODEC_ENC_PM_H_ */
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-08-16 13:01    [W:4.911 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site