Commit ba3cd671 authored by Yong Wu's avatar Yong Wu Committed by Mauro Carvalho Chehab
Browse files

media: mtk-jpeg: Get rid of mtk_smi_larb_get/put 



MediaTek IOMMU has already added device_link between the consumer
and smi-larb device. If the jpg device calls the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.

After removing the larb_get operations, then mtk_jpeg_clk_init is
also unnecessary. Remove it too.

CC: Xia Jiang <xia.jiang@mediatek.com>
Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarEvan Green <evgreen@chromium.org>
Acked-by: default avatarRick Chang <rick.chang@mediatek.com>
Reviewed-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Tested-by: Frank Wunderlich <frank-w@public-files.de> # BPI-R2/MT7623
Acked-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 635319a4

drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c

+2 −43
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <media/v4l2-ioctl.h>

#include <media/videobuf2-core.h>

#include <media/videobuf2-dma-contig.h>

#include <soc/mediatek/smi.h>



#include "mtk_jpeg_enc_hw.h"

#include "mtk_jpeg_dec_hw.h"
@@ -1055,10 +1054,6 @@ static void mtk_jpeg_clk_on(struct mtk_jpeg_dev *jpeg) 
{

	int ret;



	ret = mtk_smi_larb_get(jpeg->larb);

	if (ret)

		dev_err(jpeg->dev, "mtk_smi_larb_get larbvdec fail %d\n", ret);



	ret = clk_bulk_prepare_enable(jpeg->variant->num_clks,

				      jpeg->variant->clks);

	if (ret)
@@ -1069,7 +1064,6 @@ static void mtk_jpeg_clk_off(struct mtk_jpeg_dev *jpeg) 
{

	clk_bulk_disable_unprepare(jpeg->variant->num_clks,

				   jpeg->variant->clks);

	mtk_smi_larb_put(jpeg->larb);

}



static irqreturn_t mtk_jpeg_enc_done(struct mtk_jpeg_dev *jpeg)
@@ -1284,35 +1278,6 @@ static struct clk_bulk_data mtk_jpeg_clocks[] = { 
	{ .id = "jpgenc" },

};



static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg)

{

	struct device_node *node;

	struct platform_device *pdev;

	int ret;



	node = of_parse_phandle(jpeg->dev->of_node, "mediatek,larb", 0);

	if (!node)

		return -EINVAL;

	pdev = of_find_device_by_node(node);

	if (WARN_ON(!pdev)) {

		of_node_put(node);

		return -EINVAL;

	}

	of_node_put(node);



	jpeg->larb = &pdev->dev;



	ret = devm_clk_bulk_get(jpeg->dev, jpeg->variant->num_clks,

				jpeg->variant->clks);

	if (ret) {

		dev_err(&pdev->dev, "failed to get jpeg clock:%d\n", ret);

		put_device(&pdev->dev);

		return ret;

	}



	return 0;

}



static void mtk_jpeg_job_timeout_work(struct work_struct *work)

{

	struct mtk_jpeg_dev *jpeg = container_of(work, struct mtk_jpeg_dev,
@@ -1333,11 +1298,6 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work) 
	v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);

}



static inline void mtk_jpeg_clk_release(struct mtk_jpeg_dev *jpeg)

{

	put_device(jpeg->larb);

}



static int mtk_jpeg_probe(struct platform_device *pdev)

{

	struct mtk_jpeg_dev *jpeg;
@@ -1372,7 +1332,8 @@ static int mtk_jpeg_probe(struct platform_device *pdev) 
		goto err_req_irq;

	}



	ret = mtk_jpeg_clk_init(jpeg);

	ret = devm_clk_bulk_get(jpeg->dev, jpeg->variant->num_clks,

				jpeg->variant->clks);

	if (ret) {

		dev_err(&pdev->dev, "Failed to init clk, err %d\n", ret);

		goto err_clk_init;
@@ -1438,7 +1399,6 @@ static int mtk_jpeg_probe(struct platform_device *pdev) 
	v4l2_device_unregister(&jpeg->v4l2_dev);



err_dev_register:

	mtk_jpeg_clk_release(jpeg);



err_clk_init:
@@ -1456,7 +1416,6 @@ static int mtk_jpeg_remove(struct platform_device *pdev) 
	video_device_release(jpeg->vdev);

	v4l2_m2m_release(jpeg->m2m_dev);

	v4l2_device_unregister(&jpeg->v4l2_dev);

	mtk_jpeg_clk_release(jpeg);



	return 0;

}

drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h

+0 −2
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ struct mtk_jpeg_variant { 
 * @alloc_ctx:		videobuf2 memory allocator's context

 * @vdev:		video device node for jpeg mem2mem mode

 * @reg_base:		JPEG registers mapping

 * @larb:		SMI device

 * @job_timeout_work:	IRQ timeout structure

 * @variant:		driver variant to be used

 */
@@ -99,7 +98,6 @@ struct mtk_jpeg_dev { 
	void			*alloc_ctx;

	struct video_device	*vdev;

	void __iomem		*reg_base;

	struct device		*larb;

	struct delayed_work job_timeout_work;

	const struct mtk_jpeg_variant *variant;

};