xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: mdk-mdp: fix pm_runtime_get_sync() usage count

Browse Source 
[ Upstream commit d07bb9702cf5f5ccf3fb661e6cab54bbc33cd23f ]

The pm_runtime_get_sync() internally increments the
dev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a8 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.

While here, fix the return contition of mtk_mdp_m2m_start_streaming(),
as it doesn't make any sense to return 0 if the PM runtime failed
to resume.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab
2021-04-23 16:57:16 +02:00
committed by Greg Kroah-Hartman
parent ff7e4b94db
commit 437ca06c78
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
View File

@@ -394,12 +394,12 @@ static int mtk_mdp_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
struct mtk_mdp_ctx *ctx = q->drv_priv; struct mtk_mdp_ctx *ctx = q->drv_priv;
int ret; int ret;
ret = pm_runtime_get_sync(&ctx->mdp_dev->pdev->dev); ret = pm_runtime_resume_and_get(&ctx->mdp_dev->pdev->dev);
if (ret < 0) if (ret < 0)
mtk_mdp_dbg(1, "[%d] pm_runtime_get_sync failed:%d", mtk_mdp_dbg(1, "[%d] pm_runtime_resume_and_get failed:%d",
ctx->id, ret); ctx->id, ret);
return 0; return ret;
} }
static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx, static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx,