Subject: Re: [PATCH v4 08/17] media: mtk-vcodec: separate mtk-vcodec-enc node.

From: Tiffany Lin <[email-masked]>
Date: Wed, 10 Jun 2020 14:13:22 +0800

On Wed, 2020-06-10 at 13:45 +0800, CK Hu wrote:
> + Tiffany & Maoguang.
> 
> 
> On Sat, 2020-05-30 at 16:10 +0800, Yong Wu wrote:
> > From: Maoguang Meng <[email-masked]>
> > 
> > MTK H264 Encoder(VENC_SYS) and VP8 Encoder(VENC_LT_SYS) are two
> > independent hardware instance. They have their owner interrupt,
> > register mapping, and special clocks.
> > 
> > This patch seperates the two instance. This is a preparing patch for
> > adding device_link between the larbs and venc-device. It's mainly for
> > fixing the problem:
> > https://lkml.org/lkml/2019/9/3/316
> > 
> > User Call "VIDIOC_QUERYCAP":
> > H264 Encoder return driver name "mtk-vcodec-enc";
> > VP8 Encoder return driver name "mtk-venc-vp8.
> > 

Acked-by: Tiffany Lin <[email-masked]>

> > Signed-off-by: Maoguang Meng <[email-masked]>
> > Signed-off-by: Hsin-Yi Wang <[email-masked]>
> > Signed-off-by: Irui Wang <[email-masked]>
> > ---
> >  drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h |  10 +-
> >  drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c |  23 +++-
> >  .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 127 +++++++++------------
> >  .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c  |  31 +----
> >  .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h  |   1 -
> >  .../media/platform/mtk-vcodec/venc/venc_vp8_if.c   |   4 +-
> >  6 files changed, 80 insertions(+), 116 deletions(-)
> > 
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > index a2716117..52d1ce1 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > @@ -19,6 +19,7 @@
> >  #define MTK_VCODEC_DRV_NAME	"mtk_vcodec_drv"
> >  #define MTK_VCODEC_DEC_NAME	"mtk-vcodec-dec"
> >  #define MTK_VCODEC_ENC_NAME	"mtk-vcodec-enc"
> > +#define MTK_VENC_VP8_NAME	"mtk-venc-vp8"
> >  #define MTK_PLATFORM_STR	"platform:mt8173"
> >  
> >  #define MTK_VCODEC_MAX_PLANES	3
> > @@ -193,7 +194,6 @@ struct mtk_vcodec_pm {
> >  
> >  	struct mtk_vcodec_clk	venc_clk;
> >  	struct device	*larbvenc;
> > -	struct device	*larbvenclt;
> >  	struct device	*dev;
> >  	struct mtk_vcodec_dev	*mtkdev;
> >  };
> > @@ -311,25 +311,27 @@ enum mtk_chip {
> >   * @chip: chip this encoder is compatible with
> >   *
> >   * @uses_ext: whether the encoder uses the extended firmware messaging format
> > - * @has_lt_irq: whether the encoder uses the LT irq
> > + * @name: whether the encoder core is vp8
> >   * @min_birate: minimum supported encoding bitrate
> >   * @max_bitrate: maximum supported encoding bitrate
> >   * @capture_formats: array of supported capture formats
> >   * @num_capture_formats: number of entries in capture_formats
> >   * @output_formats: array of supported output formats
> >   * @num_output_formats: number of entries in output_formats
> > + * @core_id: stand for h264 or vp8 encode index
> >   */
> >  struct mtk_vcodec_enc_pdata {
> >  	enum mtk_chip chip;
> >  
> >  	bool uses_ext;
> > -	bool has_lt_irq;
> > +	const char *name;
> >  	unsigned long min_bitrate;
> >  	unsigned long max_bitrate;
> >  	const struct mtk_video_fmt *capture_formats;
> >  	size_t num_capture_formats;
> >  	const struct mtk_video_fmt *output_formats;
> >  	size_t num_output_formats;
> > +	int core_id;
> >  };
> >  
> >  /**
> > @@ -359,7 +361,6 @@ struct mtk_vcodec_enc_pdata {
> >   *
> >   * @dec_irq: decoder irq resource
> >   * @enc_irq: h264 encoder irq resource
> > - * @enc_lt_irq: vp8 encoder irq resource
> >   *
> >   * @dec_mutex: decoder hardware lock
> >   * @enc_mutex: encoder hardware lock.
> > @@ -395,7 +396,6 @@ struct mtk_vcodec_dev {
> >  
> >  	int dec_irq;
> >  	int enc_irq;
> > -	int enc_lt_irq;
> >  
> >  	struct mutex dec_mutex;
> >  	struct mutex enc_mutex;
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > index f0af78f..5301dca 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > @@ -9,6 +9,7 @@
> >  #include <media/v4l2-mem2mem.h>
> >  #include <media/videobuf2-dma-contig.h>
> >  #include <soc/mediatek/smi.h>
> > +#include <linux/pm_runtime.h>
> >  
> >  #include "mtk_vcodec_drv.h"
> >  #include "mtk_vcodec_enc.h"
> > @@ -174,7 +175,10 @@ static int vidioc_enum_fmt_vid_out(struct file *file, void *priv,
> >  static int vidioc_venc_querycap(struct file *file, void *priv,
> >  				struct v4l2_capability *cap)
> >  {
> > -	strscpy(cap->driver, MTK_VCODEC_ENC_NAME, sizeof(cap->driver));
> > +	const struct mtk_vcodec_enc_pdata *pdata =
> > +		fh_to_ctx(priv)->dev->venc_pdata;
> > +
> > +	strscpy(cap->driver, pdata->name, sizeof(cap->driver));
> >  	strscpy(cap->bus_info, MTK_PLATFORM_STR, sizeof(cap->bus_info));
> >  	strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
> >  
> > @@ -788,7 +792,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_set_param;
> > +		goto err_start_stream;
> >  	}
> >  
> >  	/* Do the initialization when both start_streaming have been called */
> > @@ -800,6 +804,12 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
> >  			return 0;
> >  	}
> >  
> > +	ret = pm_runtime_get_sync(&ctx->dev->plat_dev->dev);
> > +	if (ret < 0) {
> > +		mtk_v4l2_err("pm_runtime_get_sync 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) {
> > @@ -826,6 +836,11 @@ 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);
> >  
> > @@ -879,6 +894,10 @@ 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 b8fe408..fe17f0c 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> > @@ -49,12 +49,15 @@
> >  	},
> >  };
> >  
> > -static const struct mtk_video_fmt mtk_video_formats_capture_mt8173[] =  {
> > +static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_h264[] =  {
> >  	{
> >  		.fourcc = V4L2_PIX_FMT_H264,
> >  		.type = MTK_FMT_ENC,
> >  		.num_planes = 1,
> >  	},
> > +};
> > +
> > +static const struct mtk_video_fmt mtk_video_formats_capture_mt8173_vp8[] =  {
> >  	{
> >  		.fourcc = V4L2_PIX_FMT_VP8,
> >  		.type = MTK_FMT_ENC,
> > @@ -110,35 +113,13 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv)
> >  	ctx = dev->curr_ctx;
> >  	spin_unlock_irqrestore(&dev->irqlock, flags);
> >  
> > -	mtk_v4l2_debug(1, "id=%d", ctx->id);
> > -	addr = dev->reg_base[VENC_SYS] + MTK_VENC_IRQ_ACK_OFFSET;
> > -
> > -	ctx->irq_status = readl(dev->reg_base[VENC_SYS] +
> > -				(MTK_VENC_IRQ_STATUS_OFFSET));
> > -
> > -	clean_irq_status(ctx->irq_status, addr);
> > -
> > -	wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED);
> > -	return IRQ_HANDLED;
> > -}
> > -
> > -static irqreturn_t mtk_vcodec_enc_lt_irq_handler(int irq, void *priv)
> > -{
> > -	struct mtk_vcodec_dev *dev = priv;
> > -	struct mtk_vcodec_ctx *ctx;
> > -	unsigned long flags;
> > -	void __iomem *addr;
> > -
> > -	spin_lock_irqsave(&dev->irqlock, flags);
> > -	ctx = dev->curr_ctx;
> > -	spin_unlock_irqrestore(&dev->irqlock, flags);
> > +	mtk_v4l2_debug(1, "id=%d coreid:%d", ctx->id, dev->venc_pdata->core_id);
> > +	addr = dev->reg_base[dev->venc_pdata->core_id] +
> > +				MTK_VENC_IRQ_ACK_OFFSET;
> >  
> > -	mtk_v4l2_debug(1, "id=%d", ctx->id);
> > -	ctx->irq_status = readl(dev->reg_base[VENC_LT_SYS] +
> > +	ctx->irq_status = readl(dev->reg_base[dev->venc_pdata->core_id] +
> >  				(MTK_VENC_IRQ_STATUS_OFFSET));
> >  
> > -	addr = dev->reg_base[VENC_LT_SYS] + MTK_VENC_IRQ_ACK_OFFSET;
> > -
> >  	clean_irq_status(ctx->irq_status, addr);
> >  
> >  	wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED);
> > @@ -265,7 +246,8 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> >  	struct resource *res;
> >  	phandle rproc_phandle;
> >  	enum mtk_vcodec_fw_type fw_type;
> > -	int i, j, ret;
> > +	int ret;
> > +	void __iomem *reg_base;
> >  
> >  	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
> >  	if (!dev)
> > @@ -291,63 +273,39 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> >  	dev->venc_pdata = of_device_get_match_data(&pdev->dev);
> >  	ret = mtk_vcodec_init_enc_pm(dev);
> >  	if (ret < 0) {
> > -		dev_err(&pdev->dev, "Failed to get mt vcodec clock source!");
> > +		dev_err(&pdev->dev, "Failed to get mtk vcodec clock source!");
> >  		goto err_enc_pm;
> >  	}
> >  
> > -	for (i = VENC_SYS, j = 0; i < NUM_MAX_VCODEC_REG_BASE; i++, j++) {
> > -		res = platform_get_resource(pdev, IORESOURCE_MEM, j);
> > -		dev->reg_base[i] = devm_ioremap_resource(&pdev->dev, res);
> > -		if (IS_ERR((__force void *)dev->reg_base[i])) {
> > -			ret = PTR_ERR((__force void *)dev->reg_base[i]);
> > -			goto err_res;
> > -		}
> > -		mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[i]);
> > -	}
> > +	pm_runtime_enable(&pdev->dev);
> > +
> > +	snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s",
> > +		 dev->venc_pdata->name);
> >  
> > -	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
> > -	if (res == NULL) {
> > -		dev_err(&pdev->dev, "failed to get irq resource");
> > -		ret = -ENOENT;
> > +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > +	reg_base = devm_ioremap_resource(&pdev->dev, res);
> > +	if (IS_ERR((__force void *)reg_base)) {
> > +		ret = PTR_ERR((__force void *)reg_base);
> >  		goto err_res;
> >  	}
> > +	dev->reg_base[dev->venc_pdata->core_id] = reg_base;
> >  
> >  	dev->enc_irq = platform_get_irq(pdev, 0);
> >  	ret = devm_request_irq(&pdev->dev, dev->enc_irq,
> >  			       mtk_vcodec_enc_irq_handler,
> >  			       0, pdev->name, dev);
> >  	if (ret) {
> > -		dev_err(&pdev->dev, "Failed to install dev->enc_irq %d (%d)",
> > -			dev->enc_irq,
> > -			ret);
> > +		dev_err(&pdev->dev,
> > +			"Failed to install dev->enc_irq %d (%d) core_id:%d",
> > +			dev->enc_irq, ret, dev->venc_pdata->core_id);
> >  		ret = -EINVAL;
> >  		goto err_res;
> >  	}
> >  	disable_irq(dev->enc_irq);
> >  
> > -	if (dev->venc_pdata->has_lt_irq) {
> > -		dev->enc_lt_irq = platform_get_irq(pdev, 1);
> > -		ret = devm_request_irq(&pdev->dev,
> > -				       dev->enc_lt_irq,
> > -				       mtk_vcodec_enc_lt_irq_handler,
> > -				       0, pdev->name, dev);
> > -		if (ret) {
> > -			dev_err(&pdev->dev,
> > -				"Failed to install dev->enc_lt_irq %d (%d)",
> > -				dev->enc_lt_irq, ret);
> > -			ret = -EINVAL;
> > -			goto err_res;
> > -		}
> > -		disable_irq(dev->enc_lt_irq); /* VENC_LT */
> > -	}
> > -
> >  	mutex_init(&dev->enc_mutex);
> >  	mutex_init(&dev->dev_mutex);
> >  	spin_lock_init(&dev->irqlock);
> > -
> > -	snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s",
> > -		 "[MTK_V4L2_VENC]");
> > -
> >  	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
> >  	if (ret) {
> >  		mtk_v4l2_err("v4l2_device_register err=%d", ret);
> > @@ -373,7 +331,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> >  					V4L2_CAP_STREAMING;
> >  
> >  	snprintf(vfd_enc->name, sizeof(vfd_enc->name), "%s",
> > -		 MTK_VCODEC_ENC_NAME);
> > +			dev->venc_pdata->name);
> >  	video_set_drvdata(vfd_enc, dev);
> >  	dev->vfd_enc = vfd_enc;
> >  	platform_set_drvdata(pdev, dev);
> > @@ -401,8 +359,8 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> >  		goto err_enc_reg;
> >  	}
> >  
> > -	mtk_v4l2_debug(0, "encoder registered as /dev/video%d",
> > -			vfd_enc->num);
> > +	mtk_v4l2_debug(0, "encoder %d registered as /dev/video%d",
> > +		       dev->venc_pdata->core_id, vfd_enc->num);
> >  
> >  	return 0;
> >  
> > @@ -415,26 +373,39 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> >  err_enc_alloc:
> >  	v4l2_device_unregister(&dev->v4l2_dev);
> >  err_res:
> > -	mtk_vcodec_release_enc_pm(dev);
> > +	pm_runtime_disable(&pdev->dev);
> >  err_enc_pm:
> >  	mtk_vcodec_fw_release(dev->fw_handler);
> >  	return ret;
> >  }
> >  
> > -static const struct mtk_vcodec_enc_pdata mt8173_pdata = {
> > +static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata = {
> > +	.chip = MTK_MT8173,
> > +	.name = MTK_VCODEC_ENC_NAME,
> > +	.capture_formats = mtk_video_formats_capture_mt8173_h264,
> > +	.num_capture_formats = 1,
> > +	.output_formats = mtk_video_formats_output_mt8173,
> > +	.num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173),
> > +	.min_bitrate = 1,
> > +	.max_bitrate = 4000000,
> > +	.core_id = VENC_SYS,
> > +};
> > +
> > +static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata = {
> >  	.chip = MTK_MT8173,
> > -	.has_lt_irq = true,
> > -	.capture_formats = mtk_video_formats_capture_mt8173,
> > -	.num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8173),
> > +	.name = MTK_VENC_VP8_NAME,
> > +	.capture_formats = mtk_video_formats_capture_mt8173_vp8,
> > +	.num_capture_formats = 1,
> >  	.output_formats = mtk_video_formats_output_mt8173,
> >  	.num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173),
> >  	.min_bitrate = 1,
> >  	.max_bitrate = 4000000,
> > +	.core_id = VENC_LT_SYS,
> >  };
> >  
> >  static const struct mtk_vcodec_enc_pdata mt8183_pdata = {
> >  	.chip = MTK_MT8183,
> > -	.has_lt_irq = false,
> > +	.name = MTK_VCODEC_ENC_NAME,
> >  	.uses_ext = true,
> >  	.capture_formats = mtk_video_formats_capture_mt8183,
> >  	.num_capture_formats = ARRAY_SIZE(mtk_video_formats_capture_mt8183),
> > @@ -443,10 +414,14 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> >  	.num_output_formats = ARRAY_SIZE(mtk_video_formats_output_mt8173),
> >  	.min_bitrate = 64,
> >  	.max_bitrate = 40000000,
> > +	.core_id = VENC_SYS,
> >  };
> >  
> >  static const struct of_device_id mtk_vcodec_enc_match[] = {
> > -	{.compatible = "mediatek,mt8173-vcodec-enc", .data = &mt8173_pdata},
> > +	{.compatible = "mediatek,mt8173-vcodec-avc-enc",
> > +			.data = &mt8173_avc_pdata},
> > +	{.compatible = "mediatek,mt8173-vcodec-vp8-enc",
> > +			.data = &mt8173_vp8_pdata},
> >  	{.compatible = "mediatek,mt8183-vcodec-enc", .data = &mt8183_pdata},
> >  	{},
> >  };
> > @@ -466,7 +441,7 @@ static int mtk_vcodec_enc_remove(struct platform_device *pdev)
> >  		video_unregister_device(dev->vfd_enc);
> >  
> >  	v4l2_device_unregister(&dev->v4l2_dev);
> > -	mtk_vcodec_release_enc_pm(dev);
> > +	pm_runtime_disable(&pdev->dev);
> >  	mtk_vcodec_fw_release(dev->fw_handler);
> >  	return 0;
> >  }
> > 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 ee22902..01c6a55 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> > @@ -43,21 +43,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
> >  		return -ENODEV;
> >  	}
> >  	pm->larbvenc = &pdev->dev;
> > -
> > -	node = of_parse_phandle(dev->of_node, "mediatek,larb", 1);
> > -	if (!node) {
> > -		mtk_v4l2_err("no mediatek,larb found");
> > -		return -ENODEV;
> > -	}
> > -
> > -	pdev = of_find_device_by_node(node);
> > -	of_node_put(node);
> > -	if (!pdev) {
> > -		mtk_v4l2_err("no mediatek,larb device found");
> > -		return -ENODEV;
> > -	}
> > -
> > -	pm->larbvenclt = &pdev->dev;
> >  	pdev = mtkdev->plat_dev;
> >  	pm->dev = &pdev->dev;
> >  
> > @@ -94,11 +79,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
> >  	return ret;
> >  }
> >  
> > -void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *mtkdev)
> > -{
> > -}
> > -
> > -
> >  void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
> >  {
> >  	struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
> > @@ -116,18 +96,10 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
> >  	ret = mtk_smi_larb_get(pm->larbvenc);
> >  	if (ret) {
> >  		mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
> > -		goto larbvencerr;
> > -	}
> > -	ret = mtk_smi_larb_get(pm->larbvenclt);
> > -	if (ret) {
> > -		mtk_v4l2_err("mtk_smi_larb_get larb4 fail %d", ret);
> > -		goto larbvenclterr;
> > +		goto clkerr;
> >  	}
> >  	return;
> >  
> > -larbvenclterr:
> > -	mtk_smi_larb_put(pm->larbvenc);
> > -larbvencerr:
> >  clkerr:
> >  	for (i -= 1; i >= 0; i--)
> >  		clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> > @@ -139,7 +111,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
> >  	int i = 0;
> >  
> >  	mtk_smi_larb_put(pm->larbvenc);
> > -	mtk_smi_larb_put(pm->larbvenclt);
> >  	for (i = enc_clk->clk_num - 1; i >= 0; i--)
> >  		clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> >  }
> > 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 b7ecdfd..c1b5986 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
> > @@ -10,7 +10,6 @@
> >  #include "mtk_vcodec_drv.h"
> >  
> >  int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *dev);
> > -void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *dev);
> >  
> >  void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm);
> >  void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm);
> > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
> > index 11abb19..8267a9c 100644
> > --- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
> > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
> > @@ -367,7 +367,7 @@ static int vp8_enc_encode(void *handle,
> >  
> >  	mtk_vcodec_debug_enter(inst);
> >  
> > -	enable_irq(ctx->dev->enc_lt_irq);
> > +	enable_irq(ctx->dev->enc_irq);
> >  
> >  	switch (opt) {
> >  	case VENC_START_OPT_ENCODE_FRAME:
> > @@ -386,7 +386,7 @@ static int vp8_enc_encode(void *handle,
> >  
> >  encode_err:
> >  
> > -	disable_irq(ctx->dev->enc_lt_irq);
> > +	disable_irq(ctx->dev->enc_irq);
> >  	mtk_vcodec_debug_leave(inst);
> >  
> >  	return ret;
> 
> 

_______________________________________________
linux-arm-kernel mailing list
[email-masked]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel