From: Yong Wu <yong.wu@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>,
Joerg Roedel <joro@8bytes.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
David Airlie <airlied@linux.ie>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>
Cc: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
Yunfei Dong <yunfei.dong@mediatek.com>,
Will Deacon <will.deacon@arm.com>,
dri-devel@lists.freedesktop.org, yf.wang@mediatek.com,
anthony.huang@mediatek.com, youlin.pei@mediatek.com,
Evan Green <evgreen@chromium.org>,
Eizan Miyamoto <eizan@chromium.org>,
Matthias Kaehlcke <mka@chromium.org>,
linux-arm-kernel@lists.infradead.org, mingyuan.ma@mediatek.com,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
Philipp Zabel <p.zabel@pengutronix.de>,
libo.kang@mediatek.com, yi.kuo@mediatek.com,
linux-mediatek@lists.infradead.org,
Hsin-Yi Wang <hsinyi@chromium.org>,
Tiffany Lin <tiffany.lin@mediatek.com>,
yong.wu@mediatek.com, anan.sun@mediatek.com,
srv_heupstream@mediatek.com, acourbot@chromium.org,
linux-kernel@vger.kernel.org, Tomasz Figa <tfiga@chromium.org>,
iommu@lists.linux-foundation.org, Daniel Vetter <daniel@ffwll.ch>,
Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH v9 11/15] media: mtk-vcodec: dec: Remove mtk_vcodec_release_dec_pm
Date: Fri, 12 Nov 2021 18:55:05 +0800 [thread overview]
Message-ID: <20211112105509.12010-12-yong.wu@mediatek.com> (raw)
In-Reply-To: <20211112105509.12010-1-yong.wu@mediatek.com>
After this patchset, mtk_vcodec_release_dec_pm has only one line.
then remove that function. Use pm_runtime_disable directly instead.
For symmetry, move the pm_runtime_enable out from
mtk_vcodec_init_dec_pm, then mtk_vcodec_init_dec_pm only operate for
the clocks, rename it from the _pm to _clk.
No functional change.
CC: Tiffany Lin <tiffany.lin@mediatek.com>
CC: Yunfei Dong <yunfei.dong@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 8 +++++---
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 9 +--------
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 3 +--
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index f87dc47d9e63..830c400b9830 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/of.h>
+#include <linux/pm_runtime.h>
#include <media/v4l2-event.h>
#include <media/v4l2-mem2mem.h>
#include <media/videobuf2-dma-contig.h>
@@ -240,12 +241,13 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
if (IS_ERR(dev->fw_handler))
return PTR_ERR(dev->fw_handler);
- ret = mtk_vcodec_init_dec_pm(dev);
+ ret = mtk_vcodec_init_dec_clk(dev);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to get mt vcodec clock source");
goto err_dec_pm;
}
+ pm_runtime_enable(&pdev->dev);
for (i = 0; i < NUM_MAX_VDEC_REG_BASE; i++) {
dev->reg_base[i] = devm_platform_ioremap_resource(pdev, i);
if (IS_ERR((__force void *)dev->reg_base[i])) {
@@ -345,7 +347,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
err_dec_alloc:
v4l2_device_unregister(&dev->v4l2_dev);
err_res:
- mtk_vcodec_release_dec_pm(dev);
+ pm_runtime_disable(&pdev->dev);
err_dec_pm:
mtk_vcodec_fw_release(dev->fw_handler);
return ret;
@@ -371,7 +373,7 @@ static int mtk_vcodec_dec_remove(struct platform_device *pdev)
video_unregister_device(dev->vfd_dec);
v4l2_device_unregister(&dev->v4l2_dev);
- mtk_vcodec_release_dec_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_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
index d0bf9aa3b29d..3df87944e9a2 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
@@ -12,7 +12,7 @@
#include "mtk_vcodec_dec_pm.h"
#include "mtk_vcodec_util.h"
-int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
+int mtk_vcodec_init_dec_clk(struct mtk_vcodec_dev *mtkdev)
{
struct platform_device *pdev;
struct mtk_vcodec_pm *pm;
@@ -57,16 +57,9 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
return PTR_ERR(clk_info->vcodec_clk);
}
}
-
- pm_runtime_enable(&pdev->dev);
return 0;
}
-void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev)
-{
- pm_runtime_disable(dev->pm.dev);
-}
-
int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)
{
int ret;
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
index 280aeaefdb65..dace91401e23 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
@@ -9,8 +9,7 @@
#include "mtk_vcodec_drv.h"
-int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *dev);
-void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev);
+int mtk_vcodec_init_dec_clk(struct mtk_vcodec_dev *dev);
int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm);
void mtk_vcodec_dec_pw_off(struct mtk_vcodec_pm *pm);
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-11-12 11:01 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 10:54 [PATCH v9 00/15] Clean up "mediatek,larb" Yong Wu
2021-11-12 10:54 ` [PATCH v9 01/15] dt-binding: mediatek: Get rid of mediatek, larb for multimedia HW Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:54 ` [PATCH v9 02/15] iommu/mediatek-v1: Free the existed fwspec if the master dev already has Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:54 ` [PATCH v9 03/15] iommu/mediatek: Return ENODEV if the device is NULL Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:54 ` [PATCH v9 04/15] iommu/mediatek: Add probe_defer for smi-larb Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:54 ` [PATCH v9 05/15] iommu/mediatek: Add device_link between the consumer and the larb devices Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 06/15] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 07/15] media: mtk-mdp: " Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 08/15] drm/mediatek: Add pm runtime support for ovl and rdma Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 09/15] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 10/15] media: mtk-vcodec: " Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` Yong Wu [this message]
2022-01-11 10:57 ` [PATCH v9 11/15] media: mtk-vcodec: dec: Remove mtk_vcodec_release_dec_pm AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 12/15] media: mtk-vcodec: enc: Remove mtk_vcodec_release_enc_pm Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2022-01-13 10:11 ` AngeloGioacchino Del Regno
2022-01-13 10:15 ` Hans Verkuil
2022-01-13 10:17 ` AngeloGioacchino Del Regno
2022-01-13 16:10 ` Matthias Brugger
2022-01-17 9:41 ` Yong Wu
2022-01-21 11:56 ` Hans Verkuil
2021-11-12 10:55 ` [PATCH v9 13/15] memory: mtk-smi: Get rid of mtk_smi_larb_get/put Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 14/15] arm: dts: mediatek: Get rid of mediatek, larb for MM nodes Yong Wu
2021-11-12 10:55 ` [PATCH v9 15/15] arm64: " Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-12-06 11:52 ` [PATCH v9 00/15] Clean up "mediatek,larb" Joerg Roedel
2021-12-06 12:33 ` Hans Verkuil
2021-12-06 13:48 ` Joerg Roedel
2021-12-06 12:23 ` Hans Verkuil
2021-12-06 13:06 ` Hsin-Yi Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211112105509.12010-12-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=acourbot@chromium.org \
--cc=airlied@linux.ie \
--cc=anan.sun@mediatek.com \
--cc=anthony.huang@mediatek.com \
--cc=chunkuang.hu@kernel.org \
--cc=dafna.hirschfeld@collabora.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eizan@chromium.org \
--cc=evgreen@chromium.org \
--cc=hsinyi@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=krzysztof.kozlowski@canonical.com \
--cc=libo.kang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=mingyuan.ma@mediatek.com \
--cc=mka@chromium.org \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@chromium.org \
--cc=tiffany.lin@mediatek.com \
--cc=will.deacon@arm.com \
--cc=yf.wang@mediatek.com \
--cc=yi.kuo@mediatek.com \
--cc=youlin.pei@mediatek.com \
--cc=yunfei.dong@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).