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

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

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -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]);

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h

+4 −0
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c

+68 −8
Original line number Diff line number Diff line
@@ -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 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm) 
}

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);

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h

+4 −4
Original line number Diff line number Diff line
@@ -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_ */