Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: mtk-vcodec: Refactor vcodec pm interface

Browse Source 
Using the needed params for pm init/release function and remove unused
param mtkdev in 'struct mtk_vcodec_pm'.

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: Tzung-Bi Shih <tzungbi@google.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Steve Cho <stevecho@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Yunfei Dong 2022-01-13 05:10:39 +01:00 committed by Mauro Carvalho Chehab
parent a1dcdd6acc
commit d745646b62
5 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
View File

@ -246,7 +246,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
if (IS_ERR(dev->fw_handler)) if (IS_ERR(dev->fw_handler))
return PTR_ERR(dev->fw_handler); return PTR_ERR(dev->fw_handler);
ret = mtk_vcodec_init_dec_pm(dev); ret = mtk_vcodec_init_dec_pm(dev->plat_dev, &dev->pm);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to get mt vcodec clock source"); dev_err(&pdev->dev, "Failed to get mt vcodec clock source");
goto err_dec_pm; goto err_dec_pm;
@ -377,7 +377,7 @@ err_dec_mem_init:
err_dec_alloc: err_dec_alloc:
v4l2_device_unregister(&dev->v4l2_dev); v4l2_device_unregister(&dev->v4l2_dev);
err_res: err_res:
mtk_vcodec_release_dec_pm(dev); mtk_vcodec_release_dec_pm(&dev->pm);
err_dec_pm: err_dec_pm:
mtk_vcodec_fw_release(dev->fw_handler); mtk_vcodec_fw_release(dev->fw_handler);
return ret; return ret;
@ -416,7 +416,7 @@ static int mtk_vcodec_dec_remove(struct platform_device *pdev)
video_unregister_device(dev->vfd_dec); video_unregister_device(dev->vfd_dec);
v4l2_device_unregister(&dev->v4l2_dev); v4l2_device_unregister(&dev->v4l2_dev);
mtk_vcodec_release_dec_pm(dev); mtk_vcodec_release_dec_pm(&dev->pm);
mtk_vcodec_fw_release(dev->fw_handler); mtk_vcodec_fw_release(dev->fw_handler);
return 0; return 0;
} }

23
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
View File

@ -13,18 +13,14 @@
#include "mtk_vcodec_dec_pm.h" #include "mtk_vcodec_dec_pm.h"
#include "mtk_vcodec_util.h" #include "mtk_vcodec_util.h"
int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) int mtk_vcodec_init_dec_pm(struct platform_device *pdev, struct mtk_vcodec_pm *pm)
{ {
struct device_node *node; struct device_node *node;
struct platform_device *pdev; struct platform_device *larb_pdev;
struct mtk_vcodec_pm *pm;
struct mtk_vcodec_clk *dec_clk; struct mtk_vcodec_clk *dec_clk;
struct mtk_vcodec_clk_info *clk_info; struct mtk_vcodec_clk_info *clk_info;
int i = 0, ret = 0; int i = 0, ret = 0;
pdev = mtkdev->plat_dev;
pm = &mtkdev->pm;
pm->mtkdev = mtkdev;
dec_clk = &pm->vdec_clk; dec_clk = &pm->vdec_clk;
node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0); node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0);
if (!node) { if (!node) {
@ -32,13 +28,12 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
return -1; return -1;
} }
pdev = of_find_device_by_node(node); larb_pdev = of_find_device_by_node(node);
of_node_put(node); of_node_put(node);
if (WARN_ON(!pdev)) { if (WARN_ON(!larb_pdev))
return -1; return -1;
}
pm->larbvdec = &pdev->dev; pm->larbvdec = &larb_pdev->dev;
pdev = mtkdev->plat_dev;
pm->dev = &pdev->dev; pm->dev = &pdev->dev;
dec_clk->clk_num = dec_clk->clk_num =
@ -82,10 +77,10 @@ put_device:
return ret; return ret;
} }
void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev) void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm)
{ {
pm_runtime_disable(dev->pm.dev); pm_runtime_disable(pm->dev);
put_device(dev->pm.larbvdec); put_device(pm->larbvdec);
} }
int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm) int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm)

4
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
View File

@ -9,8 +9,8 @@
#include "mtk_vcodec_drv.h" #include "mtk_vcodec_drv.h"
int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *dev); int mtk_vcodec_init_dec_pm(struct platform_device *pdev, struct mtk_vcodec_pm *pm);
void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev); void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm);
int mtk_vcodec_dec_pw_on(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_pw_off(struct mtk_vcodec_pm *pm);

1
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
View File

@ -195,7 +195,6 @@ struct mtk_vcodec_pm {
struct mtk_vcodec_clk venc_clk; struct mtk_vcodec_clk venc_clk;
struct device *larbvenc; struct device *larbvenc;
struct device *dev; struct device *dev;
struct mtk_vcodec_dev *mtkdev;
}; };
/** /**

1
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
View File

@ -26,7 +26,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
pdev = mtkdev->plat_dev; pdev = mtkdev->plat_dev;
pm = &mtkdev->pm; pm = &mtkdev->pm;
memset(pm, 0, sizeof(struct mtk_vcodec_pm)); memset(pm, 0, sizeof(struct mtk_vcodec_pm));
pm->mtkdev = mtkdev;
pm->dev = &pdev->dev; pm->dev = &pdev->dev;
dev = &pdev->dev; dev = &pdev->dev;
enc_clk = &pm->venc_clk; enc_clk = &pm->venc_clk;